Tue Oct 18 23:14:48 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-10-18 23:14:49 +0000
committer: root <root@rshg054.dnsready.net> 2011-10-18 23:14:49 +0000
commit: 791dde5091677cd6370690f9df9fb7cbdcfe0968 (patch)
tree: 44b8403e7782995a56c22f0fdacd13b227667bb1
parent: c4f201fd7208805c7ee00e0ee833d3cc505898ac (diff)
132 files changed, 4262 insertions, 305 deletions
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index 335b36144..2b1e7cc8a 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -1,28 +1,31 @@
-# $Id: PKGBUILD 55080 2011-09-02 08:40:53Z andrea $
+# $Id: PKGBUILD 56937 2011-10-17 08:19:53Z ibiru $
 # Maintainer: 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.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A PDF Viewer which behaves like Vim"
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/"
 license=('GPL')
-depends=('poppler-glib' 'djvulibre')
-source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch)
+depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre')
+source=(https://github.com/downloads/naihe2010/$pkgname/$pkgname-${pkgver}-Source.tar.gz apvlv-poppler015.patch poppler-gdk.patch)
 md5sums=('381d83aa9c253fac5e0be165fca39222'
-         '308b17a563ed470ea47d408f324ab745')
+         '308b17a563ed470ea47d408f324ab745'
+         '076d794ab865e9bd53a5dfd2db1eaa8b')
 
 makedepends=('cmake') 
 
 build() {
   cd $srcdir/$pkgname-$pkgver-Source
   patch -Np1 -i $srcdir/apvlv-poppler015.patch
+  patch -Np1 -i $srcdir/poppler-gdk.patch
+
   mkdir -p build
   cd build
-
+  
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DAPVLV_WITH_UMD=no  ..
diff --git a/community/apvlv/poppler-gdk.patch b/community/apvlv/poppler-gdk.patch
new file mode 100644
index 000000000..ab487cf1c
--- /dev/null
+++ b/community/apvlv/poppler-gdk.patch
@@ -0,0 +1,150 @@
+diff -ruN apvlv-0.1.2-Source/src/ApvlvFile.cpp apvlv-0.1.2-Source.new/src/ApvlvFile.cpp
+--- apvlv-0.1.2-Source/src/ApvlvFile.cpp	2011-10-10 14:23:19.205606984 +0200
++++ apvlv-0.1.2-Source.new/src/ApvlvFile.cpp	2011-10-10 14:21:50.870952455 +0200
+@@ -29,6 +29,10 @@
+ #include "ApvlvUtil.hpp"
+ #include "ApvlvView.hpp"
+ 
++#ifndef POPPLER_WITH_GDK
++#include "poppler-gdk.h"
++#endif
++
+ #ifdef HAVE_LIBUMD
+ #define LIBUMD_ENABLE_GTK
+ #include <umd.h>
+diff -ruN apvlv-0.1.2-Source/src/poppler-gdk.h apvlv-0.1.2-Source.new/src/poppler-gdk.h
+--- apvlv-0.1.2-Source/src/poppler-gdk.h	1970-01-01 01:00:00.000000000 +0100
++++ apvlv-0.1.2-Source.new/src/poppler-gdk.h	2011-10-10 14:22:06.077846565 +0200
+@@ -0,0 +1,132 @@
++#include <goo/gtypes.h>
++
++static void
++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
++			      GdkPixbuf       *pixbuf)
++{
++  int cairo_width, cairo_height, cairo_rowstride;
++  unsigned char *pixbuf_data, *dst, *cairo_data;
++  int pixbuf_rowstride, pixbuf_n_channels;
++  unsigned int *src;
++  int x, y;
++
++  cairo_width = cairo_image_surface_get_width (surface);
++  cairo_height = cairo_image_surface_get_height (surface);
++  cairo_rowstride = cairo_image_surface_get_stride (surface);
++  cairo_data = cairo_image_surface_get_data (surface);
++
++  pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
++  pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
++  pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
++
++  if (cairo_width > gdk_pixbuf_get_width (pixbuf))
++    cairo_width = gdk_pixbuf_get_width (pixbuf);
++  if (cairo_height > gdk_pixbuf_get_height (pixbuf))
++    cairo_height = gdk_pixbuf_get_height (pixbuf);
++  for (y = 0; y < cairo_height; y++)
++    {
++      src = (unsigned int *) (cairo_data + y * cairo_rowstride);
++      dst = pixbuf_data + y * pixbuf_rowstride;
++      for (x = 0; x < cairo_width; x++) 
++	{
++	  dst[0] = (*src >> 16) & 0xff;
++	  dst[1] = (*src >> 8) & 0xff; 
++	  dst[2] = (*src >> 0) & 0xff;
++	  if (pixbuf_n_channels == 4)
++	      dst[3] = (*src >> 24) & 0xff;
++	  dst += pixbuf_n_channels;
++	  src++;
++	}
++    }
++}
++
++static void
++_poppler_page_render_to_pixbuf (PopplerPage *page,
++				int src_x, int src_y,
++				int src_width, int src_height,
++				double scale,
++				int rotation,
++				GBool printing,
++				GdkPixbuf *pixbuf)
++{
++  cairo_t *cr;
++  cairo_surface_t *surface;
++
++  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
++					src_width, src_height);
++  cr = cairo_create (surface);
++  cairo_save (cr);
++  switch (rotation) {
++  case 90:
++	  cairo_translate (cr, src_x + src_width, -src_y);
++	  break;
++  case 180:
++	  cairo_translate (cr, src_x + src_width, src_y + src_height);
++	  break;
++  case 270:
++	  cairo_translate (cr, -src_x, src_y + src_height);
++	  break;
++  default:
++	  cairo_translate (cr, -src_x, -src_y);
++  }
++
++  if (scale != 1.0)
++	  cairo_scale (cr, scale, scale);
++
++  if (rotation != 0)
++	  cairo_rotate (cr, rotation * G_PI / 180.0);
++
++  if (printing)
++	  poppler_page_render_for_printing (page, cr);
++  else
++	  poppler_page_render (page, cr);
++  cairo_restore (cr);
++
++  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
++  cairo_set_source_rgb (cr, 1., 1., 1.);
++  cairo_paint (cr);
++
++  cairo_destroy (cr);
++
++  copy_cairo_surface_to_pixbuf (surface, pixbuf);
++  cairo_surface_destroy (surface);
++}
++
++/**
++ * poppler_page_render_to_pixbuf:
++ * @page: the page to render from
++ * @src_x: x coordinate of upper left corner  
++ * @src_y: y coordinate of upper left corner  
++ * @src_width: width of rectangle to render  
++ * @src_height: height of rectangle to render
++ * @scale: scale specified as pixels per point
++ * @rotation: rotate the document by the specified degree
++ * @pixbuf: pixbuf to render into
++ *
++ * First scale the document to match the specified pixels per point,
++ * then render the rectangle given by the upper left corner at
++ * (src_x, src_y) and src_width and src_height.
++ * This function is for rendering a page that will be displayed.
++ * If you want to render a page that will be printed use
++ * poppler_page_render_to_pixbuf_for_printing() instead
++ *
++ * Deprecated: 0.16
++ **/
++void
++poppler_page_render_to_pixbuf (PopplerPage *page,
++			       int src_x, int src_y,
++			       int src_width, int src_height,
++			       double scale,
++			       int rotation,
++			       GdkPixbuf *pixbuf)
++{
++  g_return_if_fail (POPPLER_IS_PAGE (page));
++  g_return_if_fail (scale > 0.0);
++  g_return_if_fail (pixbuf != NULL);
++
++  _poppler_page_render_to_pixbuf (page, src_x, src_y,
++				  src_width, src_height,
++				  scale, rotation,
++				  gFalse,
++				  pixbuf);
++}
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index df575a001..3cc5b8da4 100644
--- a/community/atanks/PKGBUILD
+++ b/community/atanks/PKGBUILD
@@ -1,43 +1,32 @@
-# $Id: PKGBUILD 48863 2011-06-06 21:45:37Z tdziedzic $
+# $Id: PKGBUILD 56999 2011-10-18 03:48:36Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
 # Contributor: Charlie Cox <ccoxiv@yahoo.com>
 
 pkgname=atanks
-pkgver=5.0
+pkgver=5.2
 pkgrel=1
 pkgdesc="Atomic Tanks"
 url="http://atanks.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('sed')
-depends=('allegro>=4.4.0.1' 'gcc-libs')
+depends=('allegro4>=4.4.0.1' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz")
-md5sums=('1978fabfb5ab2c33bd079eb492ee4362')
+md5sums=('05bedbb7b3f50831a30b47f7776c8c1a')
 
 build() {
   cd atanks-${pkgver}
-
-  #debug messages fix
-  #sed -i '/lines->Display_All(TRUE)/d' src/files.cpp
-  #sed -i '/Scroll Offset:/d' src/files.cpp
-  #sed -i '/T offset:/d' src/files.cpp
-  #
-  #sed -i '1,1i#include <sys/stat.h>' src/files.cpp
-
   make
 }
 
 package() {
   cd atanks-${pkgver}
-
-  make PREFIX=${pkgdir}/usr/ INSTALL="install -c" install
+  make DESTDIR=${pkgdir} INSTALL="install -c" install
 
   sed -i 's/^Name=atanks/Name=Atomic Tanks/' atanks.desktop
   sed -i 's/^Categories=Game;/Categories=Game;StrategyGame;/' atanks.desktop
 
-  install -Dm644 atanks.desktop \
-    $pkgdir/usr/share/applications/atanks.desktop
-  install -Dm644 atanks.png \
-    $pkgdir/usr/share/pixmaps/atanks.png
+  install -Dm644 atanks.desktop $pkgdir/usr/share/applications/atanks.desktop
+  install -Dm644 atanks.png $pkgdir/usr/share/pixmaps/atanks.png
 }
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 0824f557d..1af42aa52 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56837 2011-10-14 14:47:09Z giovanni $
+# $Id: PKGBUILD 56939 2011-10-17 08:20:07Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
 pkgver=0.8.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index a0abac0c4..da196a7eb 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56117 2011-10-02 02:52:22Z ebelanger $
+# $Id: PKGBUILD 56935 2011-10-17 07:29:09Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
 pkgname=collectd
-pkgver=5.0.0
-pkgrel=7
+pkgver=5.0.1
+pkgrel=1
 pkgdesc='Daemon which collects system performance statistics periodically'
 arch=('i686' 'x86_64')
 url='http://collectd.org/'
@@ -42,13 +42,9 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached'
 depends=('libtool')
 
 source=("${url}files/${pkgname}-${pkgver}.tar.gz"
-        'libnotify-0.7.patch'
-        'yajl-2.x.patch'
         'libperl.patch'
         'rc.d')
-sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7'
-          'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337'
-          'd3854c39c9596b4f6dcf67a9eb8decea4d17120d'
+sha1sums=('ec1bf97d21a27d9b53b20f7dc4fb61441b4e42e0'
           'b221352447b2d42cade4a65ced322bcff8a40366'
           '0f441718d5519cb043b1130e5a1d0379078adbcc')
 
@@ -60,10 +56,6 @@ build() {
 	patch -p1 -i ../libperl.patch
 	autoconf
 
-	sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c
-	patch -p1 -i ../libnotify-0.7.patch
-	patch -p1 -i ../yajl-2.x.patch
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -71,8 +63,6 @@ build() {
 		--enable-static=no \
 		--with-python=/usr/bin/python2
 
-	sed -i 's/ -Werror//g' */Makefile* */*/Makefile*
-
 	make all
 }
 
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 061b8cc64..1fad2201e 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 64433 2010-01-20 12:05:44Z ibiru $
+# $Id: PKGBUILD 57001 2011-10-18 03:48:42Z ebelanger $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=6
+pkgrel=7
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64')
 url="http://openil.sourceforge.net/"
-depends=('allegro>=4.4.0.1' 'sdl' 'libpng>=1.4.0' 'libmng>=1.0.10-3' 'freeglut'
-         'jasper>=1.900.1-4' 'lcms>=1.18-3' 'openexr')
+depends=('allegro4' 'sdl' 'libpng' 'libmng' 'freeglut'
+         'jasper' 'lcms' 'openexr')
 makedepends=('bash')
 options=('!libtool' '!docs')
 license=('GPL')
 source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
+md5sums=('7918f215524589435e5ec2e8736d5e1d'
+         '0f839ccefd43b0ee8b4b3f99806147fc')
 
 build() {
    cd $srcdir/devil-$pkgver
 
-   patch -Np1 -i $srcdir/libpng14.patch || return 1
-   # configure and build
+   patch -Np1 -i $srcdir/libpng14.patch
+
    ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl
-   make || return 1
+   make
+}
+
+package() {
+   cd $srcdir/devil-$pkgver
+
    make prefix=$pkgdir/usr install
 }
-md5sums=('7918f215524589435e5ec2e8736d5e1d'
-         '0f839ccefd43b0ee8b4b3f99806147fc')
diff --git a/community/dumb/PKGBUILD b/community/dumb/PKGBUILD
index 3652f34cc..c8701a37b 100644
--- a/community/dumb/PKGBUILD
+++ b/community/dumb/PKGBUILD
@@ -1,15 +1,15 @@
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: Bj�rn Lindeijer <bjorn lindeijer nl>
+# Contributor: Bjørn Lindeijer <bjorn lindeijer nl>
 
 pkgname=dumb
 pkgver=0.9.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An IT, XM, S3M and MOD player library"
 arch=('i686' 'x86_64')
 license=('custom:dumb' 'GPL')
 url="http://dumb.sourceforge.net/"
-depends=('glibc' 'allegro')
+depends=('glibc' 'allegro4')
 source=(http://downloads.sourceforge.net/sourceforge/dumb/$pkgname-$pkgver.tar.gz)
 md5sums=('f48da5b990aa8aa822d3b6a951baf5c2')
 
diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD
index 90d7d3dc6..fb88c3d81 100644
--- a/community/epdfview/PKGBUILD
+++ b/community/epdfview/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 48161 2011-05-29 11:36:51Z schuay $
+# $Id: PKGBUILD 56941 2011-10-17 08:20:15Z ibiru $
 # 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=1
+pkgrel=2
 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')
+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"
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index 80d18e1bd..16ba15cd5 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48045 2011-05-27 17:00:59Z lcarlier $
+# $Id: PKGBUILD 56943 2011-10-17 08:20:39Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,13 +20,13 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
 depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
          'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3'
-         'curl' 'poppler' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
          'libxcursor' 'libsm')
 makedepends=('intltool' 'mysql' 'postgresql')
 license=('GPL2')
@@ -36,10 +36,12 @@ replaces=('gambas2')
 conflicts=('gambas2')
 source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
         'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
+	'poppler-0.18.patch'
 	'gambas2-script.install' 'gambas2-runtime.install')
 md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
          '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
          'ac9703b390502ed3242c8d34485c9236'
+         'a551b4b216bbdb3489f3c264bf73ee66'
          '870ff5b4b33cd75aa9c290539e6fdd5d'
          'ab5667175c4945282d2f40a35d0e9e5b')
 _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
@@ -70,6 +72,7 @@ build() {
   patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
   # merged upstream
   patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
+  patch -Np2 -i "${srcdir}/poppler-0.18.patch"
   ./reconf-all
   ##
   
@@ -677,7 +680,7 @@ package_gambas2-gb-pcre() {
 }
 
 package_gambas2-gb-pdf() {
-  depends=('gambas2-runtime' 'poppler')
+  depends=('gambas2-runtime' 'poppler-glib')
   pkgdesc="Gambas2 PDF component"
 
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
diff --git a/community/gambas2/poppler-0.18.patch b/community/gambas2/poppler-0.18.patch
new file mode 100644
index 000000000..fbcc430bf
--- /dev/null
+++ b/community/gambas2/poppler-0.18.patch
@@ -0,0 +1,40 @@
+--- gambas/trunk/gb.pdf/configure.ac	2010/07/14 01:50:18	3038
++++ gambas/trunk/gb.pdf/configure.ac	2011/08/09 10:43:30	3997
+@@ -22,6 +22,8 @@
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
+   pkg-config --atleast-version=0.11.3 poppler
+   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)
+ fi
+ 
+ AC_OUTPUT( \
+
+--- gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/06/03 00:51:09	3870
++++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp	2011/08/09 10:43:30	3997
+@@ -44,6 +44,7 @@
+ #include <Outline.h>
+ #include <Link.h>
+ #include <Gfx.h>
++#include <glib/poppler-features.h>
+ 
+ /*****************************************************************************
+ 
+@@ -956,12 +957,17 @@
+  Bookmarks of a PDF page
+ 
+ ******************************************************************************/
++
+ void aux_fill_links(void *_object)
+ {
++	#if POPPLER_VERSION_0_17
++	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
++	#else
+ 	Object obj;
+ 	
+ 	THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
+ 	obj.free();
++	#endif
+ }
+ 
+ BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index ee33c221c..50b0dacda 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55911 2011-09-24 19:25:08Z lcarlier $
+# $Id: PKGBUILD 56945 2011-10-17 08:20:48Z ibiru $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          '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') 
-pkgver=2.99.4
+pkgver=2.99.5
 pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
@@ -27,7 +27,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('4f918a701a862c7755b35d6eba988dad'
+md5sums=('dfa16f5208463e81ba8ca801948c353a'
          'b284be39d147ec799f1116a6abc068b4'
          'b5cc403990f31b8ea1c5cf37366d3d29')
 
@@ -424,6 +424,8 @@ package_gambas3-gb-form() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -434,6 +436,8 @@ package_gambas3-gb-form() {
   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*}}
@@ -449,6 +453,8 @@ package_gambas3-gb-form-dialog() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -459,6 +465,8 @@ package_gambas3-gb-form-dialog() {
   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*}}
@@ -474,6 +482,8 @@ package_gambas3-gb-form-mdi() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -484,6 +494,8 @@ package_gambas3-gb-form-mdi() {
   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*}}
@@ -497,6 +509,8 @@ package_gambas3-gb-form-stock() {
   ## Workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -505,7 +519,7 @@ package_gambas3-gb-form-stock() {
   ## Workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   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]*}
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index 25f5551c9..f5fb0b6c6 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -1,30 +1,37 @@
-# $Id: PKGBUILD 38742 2011-01-31 16:53:59Z spupykin $
+# $Id: PKGBUILD 56961 2011-10-17 10:14:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gpsbabel
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
 arch=('i686' 'x86_64')
 url="http://www.gpsbabel.org"
 license=('GPL')
 depends=('libusb-compat' 'expat')
-makedepends=('fop')
+makedepends=('fop' 'qt' 'libxml2' 'libxslt')
+optdepends=('qt')
 options=('docs')
 source=(gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz)
 md5sums=('76ea9f7852be2e98aa18976c4697ca93')
 
 build() {
   cd $srcdir/gpsbabel-$pkgver
-  mkdir -p $pkgdir/usr/bin
   ./configure --prefix=/usr
-
   make
   make doc
+  (cd gui && qmake && make)
+}
+
+package() {
+  cd $srcdir/gpsbabel-$pkgver
   make DESTDIR=$pkgdir install
 
+  # GUI
+  install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
+
   # Header install
   mkdir -p $pkgdir/usr/include/gpsbabel
   cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD
new file mode 100644
index 000000000..0eb3d0696
--- /dev/null
+++ b/community/grafx2/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Simon Parzer <simon.parzer@gmail.com>
+pkgname=grafx2
+pkgver=2.3
+pkgrel=1
+pkgdesc="Pixelart-oriented painting program (for pixling)"
+arch=('x86_64' 'i686')
+url="http://code.google.com/p/grafx2/"
+license=('GPL2')
+install=grafx2.install
+depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils')
+source=("http://grafx2.googlecode.com/files/${pkgname}-${pkgver}.1781-src.tgz"
+        "${pkgname}.desktop")
+md5sums=('916a35c4762e85b4210a1041fbbfd830'
+         '73d1cb00b7529de5cbab5c8f00640fbc')
+
+build() {
+  cd "${srcdir}/${pkgname}/src"
+
+  msg2 "Compiling..."
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}/src"
+
+  msg2 "Packaging files..."
+  make prefix="/usr" DESTDIR="${pkgdir}" install
+  msg2 "Packaging shortcut..."
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  msg2 "Packaging documentation..."
+  install -Dm644 "${srcdir}/${pkgname}/doc/README.txt" \
+    "${pkgdir}/usr/share/doc/${pkgname}/readme.txt"
+  msg2 "Packaging license..."
+  install -Dm644 "${srcdir}/${pkgname}/doc/gpl-2.0.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  msg2 "Cleaning up..."
+  rmdir ${pkgdir}/usr/share/grafx2/scripts/libs    
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/grafx2/grafx2.desktop b/community/grafx2/grafx2.desktop
new file mode 100644
index 000000000..fcd6e71fb
--- /dev/null
+++ b/community/grafx2/grafx2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+GenericName=GrafX2
+Name=GrafX2
+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/grafx2/grafx2.install b/community/grafx2/grafx2.install
new file mode 100644
index 000000000..ef816a666
--- /dev/null
+++ b/community/grafx2/grafx2.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD
index 9a79506b8..dc4b902b2 100644
--- a/community/gummi/PKGBUILD
+++ b/community/gummi/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gummi
 pkgver=0.5.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Simple LaTex editor for GTK users'
 arch=('i686' 'x86_64')
 url='http://gummi.midnightcoding.org/'
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
new file mode 100644
index 000000000..e56647780
--- /dev/null
+++ b/community/libfm/PKGBUILD
@@ -0,0 +1,32 @@
+# Contributor: Unknown47 <unknown47r@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=libfm
+pkgver=0.1.16
+pkgrel=2
+pkgdesc="the core of next generation file manager PCManFM"
+url="http://pcmanfm.sourceforge.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+groups=('lxde')
+options=('!libtool')
+install=libfm.install
+depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils')
+source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz)
+md5sums=('c09bce415ff6dc2dd835e28aeddeabe3')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-udisks \
+    --with-gnu-ld 
+  make 
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/community/libfm/libfm.install b/community/libfm/libfm.install
new file mode 100644
index 000000000..076da308e
--- /dev/null
+++ b/community/libfm/libfm.install
@@ -0,0 +1,15 @@
+post_install() {
+  usr/bin/update-mime-database usr/share/mime > /dev/null
+  usr/bin/update-desktop-database -q
+  usr/bin/gio-querymodules usr/lib/gio/modules
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+
diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD
index ae35a957a..b0d1ba02b 100644
--- a/community/libmirage/PKGBUILD
+++ b/community/libmirage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 27101 2010-09-17 14:57:55Z mherych $
+# $Id: PKGBUILD 56986 2011-10-17 16:29:39Z bpiotrowski $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=libmirage
-pkgver=1.3.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2' 'libsndfile')
 makedepends=('bison' 'flex')
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
 options=(!libtool)
-md5sums=('a223f9fd648e194c72f3809fbb0de63d')
+md5sums=('cd6cc75e1b76a0ef72821b30168c94d9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD
new file mode 100644
index 000000000..0a7ef3a33
--- /dev/null
+++ b/community/pcmanfm/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Unknown47 <unknown47r@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=pcmanfm
+pkgver=0.9.9
+pkgrel=1
+pkgdesc="File manager of the LXDE Desktop"
+arch=('i686' 'x86_64')
+url="http://pcmanfm.sourceforge.net/"
+license=('GPL')
+groups=('lxde')
+depends=('gtk2' 'desktop-file-utils' 'libfm=0.1.16' 'lxmenu-data')
+makedepends=('intltool' 'pkgconfig')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz)
+md5sums=('f31ed6defb600f7046a456220d8efa3a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --sysconfdir=/etc --prefix=/usr 
+  make 
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install 
+}
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index 468fc4c67..1daa3890a 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 45044 2011-04-14 15:13:18Z jelle $
+# $Id: PKGBUILD 56949 2011-10-17 08:21:01Z ibiru $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=pdf2djvu
-pkgver=0.7.7
+pkgver=0.7.11
 pkgrel=1
 pkgdesc="Creates DjVu files from PDF files"
 arch=('i686' 'x86_64')
 url="http://pdf2djvu.googlecode.com"
 license=('GPL')
-depends=('poppler' 'djvulibre' 'libxslt')
+depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs')
 makedepends=('pstreams')
 source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
-md5sums=('85c594881ff864d5aceaa88e833d3107')
+md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,3 +25,4 @@ package() {
     make install DESTDIR=${pkgdir}
     install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
 }
+md5sums=('37c3d5a31c155bc65a39912da4c6bce1')
diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD
index 9e149aa3c..c15c7af0f 100644
--- a/community/pdf2svg/PKGBUILD
+++ b/community/pdf2svg/PKGBUILD
@@ -4,14 +4,13 @@
 
 pkgname=pdf2svg
 pkgver=0.2.1
-pkgrel=5
-pkgdesc="A pdf to svg convertor"
+pkgrel=6
+pkgdesc="A pdf to svg converter"
 arch=('i686' 'x86_64')
 url="http://www.cityinthesky.co.uk/pdf2svg.html"
 license=('GPL')
-depends=('poppler-glib')
-source=("http://www.cityinthesky.co.uk/files/$pkgname-$pkgver.tar.gz")
-md5sums=('59b3b9768166f73b77215e95d91f0a9d')
+depends=('poppler-glib' 'gtk2' 'glib2')
+source=("http://www.cityinthesky.co.uk/_media/opensource/$pkgname-$pkgver.tar.gz")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,3 +24,4 @@ package() {
 }
 
 
+md5sums=('59b3b9768166f73b77215e95d91f0a9d')
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 708898b9e..4c0b21e74 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -1,30 +1,30 @@
-# Id:$
+# $Id: PKGBUILD 56997 2011-10-18 03:35:07Z ebelanger $
 # Maintainer: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-xml-libxslt
-pkgver=1.70
-pkgrel=6
-pkgdesc="Interface to the gnome libxslt library "
+pkgver=1.73
+pkgrel=1
+pkgdesc="Interface to the gnome libxslt library"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/XML-LibXSLT"
 license=('GPL')
 depends=('perl-xml-libxml' 'libxslt')
-source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) 
-md5sums=('c63a7913999de076e5c911810f69b392')
+options=('!emptydirs')
+source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz)
+md5sums=('99b372c85cae773a073d4387e305c29c')
 
 build() {
-  cd  $srcdir/XML-LibXSLT-$pkgver
+  cd "$srcdir/XML-LibXSLT-$pkgver"
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
-check () {
-  cd  $srcdir/XML-LibXSLT-$pkgver
+check() {
+  cd "$srcdir/XML-LibXSLT-$pkgver"
   make test
 }
 
 package() {
-  cd  $srcdir/XML-LibXSLT-$pkgver
-  make install DESTDIR=$pkgdir
+  cd "$srcdir/XML-LibXSLT-$pkgver"
+  make install DESTDIR="$pkgdir"
 }
-
diff --git a/community/python2-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD
new file mode 100755
index 000000000..24ba9e35d
--- /dev/null
+++ b/community/python2-cheetah/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 56977 2011-10-17 13:24:23Z jelle $
+# Contributor: James Rayner <james@archlinux.org>
+# Contributor: Todd Maynard <arch@toddmaynard.com>
+
+pkgname=python2-cheetah
+pkgver=2.4.4
+pkgrel=3
+pkgdesc="A Python-powered template engine and code generator"
+arch=('i686' 'x86_64')
+url="http://www.cheetahtemplate.org/"
+license=('custom')
+depends=('python2' 'python-markdown')
+makedepends=('python2-distribute')
+optdepends=('python2-pygments: for the CodeHighlighter filter')
+provides=('cheetah' 'python-cheetah')
+conflicts=('cheetah' 'python-cheetah')
+source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz)
+md5sums=('853917116e731afbc8c8a43c37e6ddba')
+
+build() {
+  cd "${srcdir}/Cheetah-${pkgver}"
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/Cheetah-${pkgver}"
+  python2 setup.py install --root="${pkgdir}"
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  find $pkgdir/usr/lib/python2.7/site-packages/Cheetah/ -name '*.py' | \
+    xargs sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|"
+}
diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD
index 5dae427ec..2b93c0bf0 100644
--- a/community/python2-poppler/PKGBUILD
+++ b/community/python2-poppler/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 42185 2011-03-15 10:57:39Z jelle $
+# $Id: PKGBUILD 56953 2011-10-17 08:21:15Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=python2-poppler
 _realname=pypoppler
 pkgver=0.12.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Python 2.x bindings for Poppler"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/poppler-python"
 license=('GPL')
-depends=('pygtk' 'poppler-glib')
+depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2')
 provides=('pypoppler' 'python-poppler')
 conflicts=('python-poppler')
 replaces=('python-poppler')
-options=(!libtool force)
+options=(!libtool)
 source=(http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz
         pypoppler-0.12.1-poppler-0.16.0.patch)
 md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a'
diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD
index 1be576c02..6ca660613 100644
--- a/community/tnftp/PKGBUILD
+++ b/community/tnftp/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 20856 2010-07-12 13:13:46Z spupykin $
+# $Id: PKGBUILD 56963 2011-10-17 10:15:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
 
 pkgname=tnftp
 pkgver=20100108
-pkgrel=1
+pkgrel=2
 pkgdesc="NetBSD FTP client with several advanced features"
 arch=('i686' 'x86_64')
 url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
 license=('BSD')
 depends=('ncurses' 'dante')
-conflicts=('inetutils')
 source=(ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/$pkgname-$pkgver.tar.gz)
 md5sums=('192aac255abd515d7d4cc9b397dc0cba')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --enable-editcomplete
-  make || return 1
-  make install DESTDIR=$pkgdir || return 1
+  make
+  make install DESTDIR=$pkgdir
   install -Dm755 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
diff --git a/community/tvision/PKGBUILD b/community/tvision/PKGBUILD
index 2363dde33..a07df4e45 100644
--- a/community/tvision/PKGBUILD
+++ b/community/tvision/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 23701 2010-08-14 23:06:10Z spupykin $
+# $Id: PKGBUILD 57007 2011-10-18 03:49:00Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=tvision
 pkgver=2.2.1_r1
-pkgrel=1
+pkgrel=2
 pkgdesc="turbo vision library port (console interface)"
 arch=(i686 x86_64)
 url="http://tvision.sourceforge.net"
 license=("GPL")
-depends=(gpm gcc-libs libxmu allegro)
+depends=(gpm gcc-libs libxmu)
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/project/tvision/UNIX/2.2.1%20CVS20100714%20Source%20and%20Debian%205.0/rhtvision_${pkgver/_r/-}.tar.gz"
 	tvision-build-fix.patch)
@@ -18,10 +18,8 @@ md5sums=('46b815d86bbbb2f9b112b11f63e2f5a6'
 
 build() {
   cd $srcdir/$pkgname
-
   patch -p1 <$srcdir/tvision-build-fix.patch
-
   ./configure --prefix=/usr --include=/usr/include
-  make || return 1
+  make
   make prefix=$pkgdir/usr install
 }
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 1bea4c391..9aef3ce41 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54972 2011-08-29 09:50:03Z spupykin $
+# $Id: PKGBUILD 56955 2011-10-17 08:21:21Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
 pkgname=zathura
 pkgver=0.0.8.4
-pkgrel=2
+pkgrel=4
 pkgdesc="a PDF viewer"
 arch=('i686' 'x86_64')
 url="http://zathura.pwmt.org"
@@ -26,4 +26,6 @@ package() {
   cd $srcdir/zathura-$pkgver
   make install DESTDIR=$pkgdir
   install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  mkdir -p $pkgdir/etc/bash_completion.d/
+  echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/etc/bash_completion.d/zathura
 }
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index 582e292cc..5ea51ee5d 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 125663 2011-05-27 21:50:52Z ibiru $
+# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
-pkgver=4.4.2
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('i686' 'x86_64')
 url="http://alleg.sourceforge.net/"
 license=('custom')
-depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng')
-makedepends=('cmake')
-source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz
-        LICENSE)
-md5sums=('4db71b0460fc99926ae91d223199c2e6'
-         'cd97e2992e8e66b9e6a449d832dc9c7a')
+depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
+makedepends=('cmake' 'mesa')
+source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e2e314ee7116c7efddd0497d6c885e46')
 
 build() {
   cd "${srcdir}"
@@ -34,6 +32,5 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/allegro4/LICENSE b/extra/allegro4/LICENSE
new file mode 100644
index 000000000..497c56a8f
--- /dev/null
+++ b/extra/allegro4/LICENSE
@@ -0,0 +1,26 @@
+===================================
+============ Copyright ============
+===================================
+
+   Allegro is gift-ware. It was created by a number of people working in 
+   cooperation, and is given to you freely as a gift. You may use, modify, 
+   redistribute, and generally hack it about in any way you like, and you do 
+   not have to give us anything in return. However, if you like this product 
+   you are encouraged to thank us by making a return gift to the Allegro 
+   community. This could be by writing an add-on package, providing a useful 
+   bug report, making an improvement to the library, or perhaps just 
+   releasing the sources of your program so that other people can learn from 
+   them. If you redistribute parts of this code or make a game using it, it 
+   would be nice if you mentioned Allegro somewhere in the credits, but you 
+   are not required to do this. We trust you not to abuse our generosity.
+
+   Disclaimer:
+
+   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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
new file mode 100644
index 000000000..eae85013f
--- /dev/null
+++ b/extra/allegro4/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 140690 2011-10-18 03:46:10Z eric $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: arjan <arjan@archlinux.org>
+
+pkgname=allegro4
+pkgver=4.4.2
+pkgrel=1
+pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)"
+arch=('i686' 'x86_64')
+url="http://alleg.sourceforge.net/"
+license=('custom')
+depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor')
+makedepends=('cmake' 'libpng')
+source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
+        LICENSE)
+md5sums=('4db71b0460fc99926ae91d223199c2e6'
+         'cd97e2992e8e66b9e6a449d832dc9c7a')
+
+build() {
+  cd "${srcdir}"
+  mkdir build && cd build
+
+  cmake "../allegro-${pkgver}" \
+  	-DCMAKE_BUILD_TYPE=Release \
+  	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DWANT_DOCS=OFF
+
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index ab6daca4f..cee554750 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132770 2011-07-26 00:09:35Z bisson $
+# $Id: PKGBUILD 140665 2011-10-17 22:40:35Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.2
+pkgver=0.97.3
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk
         'conf.d'
         'logrotate'
         'config.patch')
-sha1sums=('27d47c6ad22edc87c030f6d483fab1e13320cbf7'
+sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655'
           '7f15f0b13a1c11235bc99ef0add01efd8a442f07'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
@@ -28,7 +28,7 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 < ../config.patch
+	patch -p1 -i ../config.patch
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/clamav \
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 77581bd96..77fa0bb66 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139253 2011-10-01 18:56:43Z ibiru $
+# $Id: PKGBUILD 140567 2011-10-17 08:14:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64')
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 74172e954..65c57d064 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137498 2011-09-07 18:03:42Z bisson $
+# $Id: PKGBUILD 140668 2011-10-18 00:42:56Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.8
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -17,18 +17,15 @@ optdepends=('qt: support for qt4 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.xz"
-        'qt4-lib64.patch'
-        'missing.patch')
-sha1sums=('c400924a8827723d7d69183bbafae13ae9e1949d'
-          '4307b0d7d6dc10f15909c94973c4357caf31de7e'
-          '791c190c8b0db2e70b0099d4d03a32417497d065')
+        'qt4-lib64.patch')
+sha1sums=('151d1286dc54d7f7fa230d37e89d3d0fe0845258'
+          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../missing.patch
 	patch -p1 -i ../qt4-lib64.patch
 	sed '/include suffixes-rule/a \
 		CFLAGS+='"${CFLAGS}"' \
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
index ac2617bac..7069a1ee7 100644
--- a/extra/gimp-devel/PKGBUILD
+++ b/extra/gimp-devel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136060 2011-08-22 10:24:51Z eric $
+# $Id: PKGBUILD 140571 2011-10-17 08:14:44Z jgc $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gimp-devel
 pkgver=2.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index a04de0a07..c083eb449 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130354 2011-07-05 17:55:54Z eric $
+# $Id: PKGBUILD 140569 2011-10-17 08:14:42Z jgc $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgname=gimp
 pkgver=2.6.11
-pkgrel=6
+pkgrel=7
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
@@ -19,18 +19,22 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu
 options=('!libtool' '!makeflags')
 conflicts=('gimp-devel')
 install=gimp.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
-        uri-backend-libcurl.patch)
+#source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
+source=(http://mirror.umoss.org/gimp/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
+        uri-backend-libcurl.patch gimp-poppler-0.18.patch)
 md5sums=('bb2939fe13e54fc7255cef5d097bb5dd'
          'bb27bc214261d36484093e857f015f38'
-         'e894f4b2ffa92c71448fdd350e9b78c6')
+         'e894f4b2ffa92c71448fdd350e9b78c6'
+         'bfc73f80e911ed7a7d500d80973469f1')
 sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c'
           '110ce9798173b19a662d086ed7b882b4729f06cf'
-          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4')
+          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4'
+          '1479a6d80be7adf74f66a3b88057a5029fe892e8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 < ../uri-backend-libcurl.patch
+  patch -p1 < ../gimp-poppler-0.18.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw --with-libcurl \
diff --git a/extra/gimp/gimp-poppler-0.18.patch b/extra/gimp/gimp-poppler-0.18.patch
new file mode 100644
index 000000000..0715460bc
--- /dev/null
+++ b/extra/gimp/gimp-poppler-0.18.patch
@@ -0,0 +1,476 @@
+From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Fri, 6 May 2011 11:58:44 +0200
+Subject: [PATCH] patch: poppler-0.17
+
+Squashed commit of the following:
+
+commit 529d940222dfc352d41fbf72de29134421aa4002
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Fri May 6 11:50:30 2011 +0200
+
+    use code based on pixbufs instead of cairo surfaces
+
+    this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for
+    hints how to do this
+
+commit f8671d8767d4cdab830dc06310e96c63a88ec0fd
+Author: Mukund Sivaraman <muks@banu.com>
+Date:   Thu Apr 21 13:57:13 2011 +0530
+
+    file-pdf-load: Update attribution, removing bogus copyright
+    (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019)
+
+commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Thu Apr 21 13:52:18 2011 +0200
+
+    file-pdf-load: Use better API + cleanups
+
+    * fixes issues with poppler 0.17 completely
+    * uses new libgimp API to pass surfaces instead of pixbufs
+    * uses GTK+ 3 API to convert surfaces to pixbufs where available
+    (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2)
+
+commit 4e92302c4a14a961f112587a0ad86696c88da2f8
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Thu Apr 21 13:38:08 2011 +0200
+
+    file-pdf-load: Don't use deprecated API (bug #646947)
+
+    (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237)
+
+    Conflicts:
+
+    	plug-ins/common/file-pdf.c
+---
+ plug-ins/common/file-pdf.c |  323 ++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 283 insertions(+), 40 deletions(-)
+
+diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c
+index a43b459..43c2b7d 100644
+--- a/plug-ins/common/file-pdf.c
++++ b/plug-ins/common/file-pdf.c
+@@ -4,6 +4,9 @@
+  *
+  * Copyright (C) 2005 Nathan Summers
+  *
++ * Some code in render_page_to_surface() borrowed from
++ * poppler.git/glib/poppler-page.cc.
++ *
+  * 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
+@@ -80,16 +83,20 @@ static gboolean          load_dialog       (PopplerDocument        *doc,
+ static PopplerDocument * open_document     (const gchar            *filename,
+                                             GError                **error);
+ 
+-static GdkPixbuf *       get_thumbnail     (PopplerDocument        *doc,
++static cairo_surface_t * get_thumb_surface (PopplerDocument        *doc,
++                                            gint                    page,
++                                            gint                    preferred_size);
++
++static GdkPixbuf *       get_thumb_pixbuf  (PopplerDocument        *doc,
+                                             gint                    page,
+                                             gint                    preferred_size);
+ 
+ static gint32            layer_from_pixbuf (gint32                  image,
+-                                            const gchar            *layer_name,
+-                                            gint                    position,
+-                                            GdkPixbuf              *buf,
+-                                            gdouble                 progress_start,
+-                                            gdouble                 progress_scale);
++					                        const gchar            *layer_name,
++					                        gint                    position,
++					                        GdkPixbuf              *pixbuf,
++					                        gdouble                 progress_start,
++					                        gdouble                 progress_scale);
+ 
+ /**
+  ** the following was formerly part of
+@@ -433,11 +440,12 @@ run (const gchar      *name,
+         }
+       else
+         {
+-          gdouble      width  = 0;
+-          gdouble      height = 0;
+-          gdouble      scale;
+-          gint32       image  = -1;
+-          GdkPixbuf   *pixbuf = NULL;
++          gdouble    width     = 0;
++          gdouble    height    = 0;
++          gdouble    scale;
++          gint32     image     = -1;
++          gint       num_pages = 0;
++          GdkPixbuf *pixbuf    = NULL;
+ 
+           /* Possibly retrieve last settings */
+           gimp_get_data (LOAD_PROC, &loadvals);
+@@ -455,7 +463,10 @@ run (const gchar      *name,
+                   g_object_unref (page);
+                 }
+ 
+-              pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32);
++              num_pages = poppler_document_get_n_pages (doc);
++
++              pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32);
++
+               g_object_unref (doc);
+             }
+ 
+@@ -548,6 +559,187 @@ open_document (const gchar  *filename,
+   return doc;
+ }
+ 
++/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */
++
++#if (!GTK_CHECK_VERSION (3, 0, 0))
++
++static cairo_format_t
++gdk_cairo_format_for_content (cairo_content_t content)
++{
++  switch (content)
++    {
++    case CAIRO_CONTENT_COLOR:
++      return CAIRO_FORMAT_RGB24;
++    case CAIRO_CONTENT_ALPHA:
++      return CAIRO_FORMAT_A8;
++    case CAIRO_CONTENT_COLOR_ALPHA:
++    default:
++      return CAIRO_FORMAT_ARGB32;
++    }
++}
++
++static cairo_surface_t *
++gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
++                                   cairo_content_t  content,
++                                   int              src_x,
++                                   int              src_y,
++                                   int              width,
++                                   int              height)
++{
++  cairo_surface_t *copy;
++  cairo_t *cr;
++
++  copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
++                                     width,
++                                     height);
++
++  cr = cairo_create (copy);
++  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
++  cairo_set_source_surface (cr, surface, -src_x, -src_y);
++  cairo_paint (cr);
++  cairo_destroy (cr);
++
++  return copy;
++}
++
++static void
++convert_alpha (guchar *dest_data,
++               int     dest_stride,
++               guchar *src_data,
++               int     src_stride,
++               int     src_x,
++               int     src_y,
++               int     width,
++               int     height)
++{
++  int x, y;
++
++  src_data += src_stride * src_y + src_x * 4;
++
++  for (y = 0; y < height; y++) {
++    guint32 *src = (guint32 *) src_data;
++
++    for (x = 0; x < width; x++) {
++      guint alpha = src[x] >> 24;
++
++      if (alpha == 0)
++        {
++          dest_data[x * 4 + 0] = 0;
++          dest_data[x * 4 + 1] = 0;
++          dest_data[x * 4 + 2] = 0;
++        }
++      else
++        {
++          dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
++          dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
++          dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
++        }
++      dest_data[x * 4 + 3] = alpha;
++    }
++
++    src_data += src_stride;
++    dest_data += dest_stride;
++  }
++}
++
++static void
++convert_no_alpha (guchar *dest_data,
++                  int     dest_stride,
++                  guchar *src_data,
++                  int     src_stride,
++                  int     src_x,
++                  int     src_y,
++                  int     width,
++                  int     height)
++{
++  int x, y;
++
++  src_data += src_stride * src_y + src_x * 4;
++
++  for (y = 0; y < height; y++) {
++    guint32 *src = (guint32 *) src_data;
++
++    for (x = 0; x < width; x++) {
++      dest_data[x * 3 + 0] = src[x] >> 16;
++      dest_data[x * 3 + 1] = src[x] >>  8;
++      dest_data[x * 3 + 2] = src[x];
++    }
++
++    src_data += src_stride;
++    dest_data += dest_stride;
++  }
++}
++
++/**
++ * gdk_pixbuf_get_from_surface:
++ * @surface: surface to copy from
++ * @src_x: Source X coordinate within @surface
++ * @src_y: Source Y coordinate within @surface
++ * @width: Width in pixels of region to get
++ * @height: Height in pixels of region to get
++ *
++ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
++ * representation inside a #GdkPixbuf. This allows you to efficiently read
++ * individual pixels from cairo surfaces. For #GdkWindows, use
++ * gdk_pixbuf_get_from_window() instead.
++ *
++ * This function will create an RGB pixbuf with 8 bits per channel.
++ * The pixbuf will contain an alpha channel if the @surface contains one.
++ *
++ * Return value: (transfer full): A newly-created pixbuf with a reference
++ *     count of 1, or %NULL on error
++ */
++static GdkPixbuf *
++gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
++                              gint             src_x,
++                              gint             src_y,
++                              gint             width,
++                              gint             height)
++{
++  cairo_content_t content;
++  GdkPixbuf *dest;
++
++  /* General sanity checks */
++  g_return_val_if_fail (surface != NULL, NULL);
++  g_return_val_if_fail (width > 0 && height > 0, NULL);
++
++  content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR;
++  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
++                         !!(content & CAIRO_CONTENT_ALPHA),
++                         8,
++                         width, height);
++
++  surface = gdk_cairo_surface_coerce_to_image (surface, content,
++                                               src_x, src_y,
++                                               width, height);
++  cairo_surface_flush (surface);
++  if (cairo_surface_status (surface) || dest == NULL)
++    {
++      cairo_surface_destroy (surface);
++      return NULL;
++    }
++
++  if (gdk_pixbuf_get_has_alpha (dest))
++    convert_alpha (gdk_pixbuf_get_pixels (dest),
++                   gdk_pixbuf_get_rowstride (dest),
++                   cairo_image_surface_get_data (surface),
++                   cairo_image_surface_get_stride (surface),
++                   0, 0,
++                   width, height);
++  else
++    convert_no_alpha (gdk_pixbuf_get_pixels (dest),
++                      gdk_pixbuf_get_rowstride (dest),
++                      cairo_image_surface_get_data (surface),
++                      cairo_image_surface_get_stride (surface),
++                      0, 0,
++                      width, height);
++
++  cairo_surface_destroy (surface);
++  return dest;
++}
++
++#endif
++
+ static gint32
+ layer_from_pixbuf (gint32        image,
+                    const gchar  *layer_name,
+@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32        image,
+   return layer;
+ }
+ 
++static cairo_surface_t *
++render_page_to_surface (PopplerPage *page,
++                        int          width,
++                        int          height,
++                        double       scale)
++{
++  cairo_surface_t *surface;
++  cairo_t *cr;
++
++  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
++  cr = cairo_create (surface);
++
++  cairo_save (cr);
++  cairo_translate (cr, 0.0, 0.0);
++
++  if (scale != 1.0)
++    cairo_scale (cr, scale, scale);
++
++  poppler_page_render (page, cr);
++  cairo_restore (cr);
++
++  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
++  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
++  cairo_paint (cr);
++
++  cairo_destroy (cr);
++
++  return surface;
++}
++
++static GdkPixbuf *
++render_page_to_pixbuf (PopplerPage *page,
++                       int          width,
++                       int          height,
++                       double       scale)
++{
++  GdkPixbuf *pixbuf;
++  cairo_surface_t *surface;
++
++  surface = render_page_to_surface (page, width, height, scale);
++  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
++                                        cairo_image_surface_get_width (surface),
++                                        cairo_image_surface_get_height (surface));
++  cairo_surface_destroy (surface);
++
++  return pixbuf;
++}
++
+ static gint32
+ load_image (PopplerDocument        *doc,
+             const gchar            *filename,
+@@ -597,7 +837,7 @@ load_image (PopplerDocument        *doc,
+       gdouble      page_width;
+       gdouble      page_height;
+ 
+-      GdkPixbuf   *buf;
++      GdkPixbuf   *pixbuf;
+       gint         width;
+       gint         height;
+ 
+@@ -627,15 +867,13 @@ load_image (PopplerDocument        *doc,
+           gimp_image_set_resolution (image_ID, resolution, resolution);
+         }
+ 
+-      buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
+-
+-      poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf);
++      pixbuf = render_page_to_pixbuf (page, width, height, scale);
+ 
+-      layer_from_pixbuf (image_ID, page_label, i, buf,
++      layer_from_pixbuf (image_ID, page_label, i, pixbuf,
+                          doc_progress, 1.0 / pages->n_pages);
+ 
+       g_free (page_label);
+-      g_object_unref (buf);
++      g_object_unref(pixbuf);
+ 
+       doc_progress = (double) (i + 1) / pages->n_pages;
+       gimp_progress_update (doc_progress);
+@@ -676,30 +914,22 @@ load_image (PopplerDocument        *doc,
+   return image_ID;
+ }
+ 
+-static GdkPixbuf *
+-get_thumbnail (PopplerDocument *doc,
+-               gint             page_num,
+-               gint             preferred_size)
++static cairo_surface_t *
++get_thumb_surface (PopplerDocument *doc,
++                   gint             page_num,
++                   gint             preferred_size)
+ {
+   PopplerPage *page;
+-  GdkPixbuf   *pixbuf;
++  cairo_surface_t *surface;
+ 
+   page = poppler_document_get_page (doc, page_num);
+ 
+   if (! page)
+     return NULL;
+ 
+-  /* XXX: Remove conditional when we depend on poppler 0.8.0, but also
+-   * add configure check to make sure POPPLER_WITH_GDK is enabled!
+-   */
+-#ifdef POPPLER_WITH_GDK
+-  pixbuf = poppler_page_get_thumbnail_pixbuf (page);
+-#else
+-  pixbuf = poppler_page_get_thumbnail (page);
+-#endif
+-
++  surface = poppler_page_get_thumbnail (page);
+ 
+-  if (! pixbuf)
++  if (! surface)
+     {
+       gdouble width;
+       gdouble height;
+@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc,
+       width  *= scale;
+       height *= scale;
+ 
+-      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+-                               width, height);
+-
+-      poppler_page_render_to_pixbuf (page,
+-                                     0, 0, width, height, scale, 0, pixbuf);
++      surface = render_page_to_surface (page, width, height, scale);
+     }
+ 
+   g_object_unref (page);
+ 
++  return surface;
++}
++
++static GdkPixbuf *
++get_thumb_pixbuf (PopplerDocument *doc,
++                  gint             page_num,
++                  gint             preferred_size)
++{
++  cairo_surface_t *surface;
++  GdkPixbuf *pixbuf;
++
++  surface = get_thumb_surface (doc, page_num, preferred_size);
++  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
++                                        cairo_image_surface_get_width (surface),
++                                        cairo_image_surface_get_height (surface));
++  cairo_surface_destroy (surface);
++
+   return pixbuf;
+ }
+ 
+@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data)
+       idle_data->page_no  = i;
+ 
+       /* FIXME get preferred size from somewhere? */
+-      idle_data->pixbuf = get_thumbnail (thread_data->document, i,
+-                                         THUMBNAIL_SIZE);
++      idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i,
++                                            THUMBNAIL_SIZE);
+ 
+       g_idle_add (idle_set_thumbnail, idle_data);
+ 
+-- 
+1.7.5
diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD
index 30b0619c1..4bce16951 100644
--- a/extra/gnome-phone-manager/PKGBUILD
+++ b/extra/gnome-phone-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139309 2011-10-01 18:58:06Z ibiru $
+# $Id: PKGBUILD 140561 2011-10-17 08:06:31Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-phone-manager
-pkgver=0.67
+pkgver=0.68
 pkgrel=1
 pkgdesc="Control your mobile phone from your GNOME desktop."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gnome-common')
 options=('!emptydirs' '!libtool')
 install=gnome-phone-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bb21c57b8bbe0481bccb373765f9d42f260f6005f2d9c55878bfc511a5541caf')
+sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index fa560e23b..7c3ec52bc 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 125923 2011-05-31 21:45:14Z andrea $
+# $Id: PKGBUILD 140657 2011-10-17 19:09:57Z andrea $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Perfect hash function generator"
 arch=('x86_64' 'i686')
 url="http://www.gnu.org/software/gperf/"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
 install=gperf.install
-source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c1f1db32fb6598d6a93e6e88796a8632')
+source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha1sums=('e32d4aff8f0c730c9a56554377b2c6d82d0951b8'
+          '85b8c44964a70a63d751afa5906796a0417e64ce')
+options=('!makeflags')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -21,8 +23,12 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make check
+}
+
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  gzip "${pkgdir}"/usr/share/info/gperf.info
 }
diff --git a/extra/gperf/gperf.install b/extra/gperf/gperf.install
index cdb8f9de8..90ac2a86d 100644
--- a/extra/gperf/gperf.install
+++ b/extra/gperf/gperf.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 file=gperf.info.gz
 
 post_install() {
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index abb468e30..19bb5fbef 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137989 2011-09-13 21:30:09Z eric $
+# $Id: PKGBUILD 140573 2011-10-17 08:14:49Z jgc $
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index e901013ce..2425f5077 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139889 2011-10-05 19:06:53Z andrea $
+# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,13 +37,13 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
              'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw')
+             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons')
 groups=('koffice')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
         'kde4-koffice-libwpg02.patch' 'gcc46.patch')
@@ -55,7 +55,7 @@ build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-    patch -p1 -i "${srcdir}"/gcc46.patch
+	patch -p1 -i "${srcdir}"/gcc46.patch
 
 	cd "${srcdir}"
 	mkdir build
@@ -71,9 +71,12 @@ build() {
 
 package_koffice-filters(){
 	pkgdesc="Filters for the KDE office suite"
-    optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
-        'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-        'libkdcraw: support for raw images')
+	depends=('shared-mime-info')
+	optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+                   'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
+                   'libkdcraw: support for raw images' 'poppler: support for pdf' 
+		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
+		   'koffice-kplato: Kplato filters')
 	install=filters.install
         cd "${srcdir}/build/filters"
         make DESTDIR="${pkgdir}" install
@@ -81,14 +84,14 @@ package_koffice-filters(){
 
 package_koffice-interfaces(){
 	pkgdesc="Interfaces for the KDE office suite"
-	depends=('kdelibs' 'koffice-libs')
+	depends=('koffice-libs')
 	cd "${srcdir}/build/interfaces"
 	make DESTDIR="${pkgdir}" install
 }
 
 package_koffice-libs(){
 	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes')
+	depends=('kdepimlibs' 'lcms' 'koffice-servicetypes')
         cd "${srcdir}/build/libs"
         make DESTDIR="${pkgdir}" install
 }
@@ -104,6 +107,7 @@ package_koffice-plugins(){
 
 package_koffice-pics(){
 	pkgdesc="Icons for the KDE office suite"
+	depends=('desktop-file-utils' 'xdg-utils')
 	install=koffice.install
         cd "${srcdir}/build/pics"
         make DESTDIR="${pkgdir}" install
@@ -123,7 +127,7 @@ package_koffice-templates(){
 
 package_koffice-tools(){
 	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs')
+	depends=('koffice-libs' 'oxygen-icons')
         cd "${srcdir}/build/tools"
         make DESTDIR="${pkgdir}" install
 }
@@ -134,7 +138,7 @@ package_koffice-tools(){
 
 package_koffice-karbon(){
 	pkgdesc="Vector drawing application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
+	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
         optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd "${srcdir}/build/karbon"
@@ -149,7 +153,8 @@ package_koffice-karbon-doc(){
 
 package_koffice-kexi(){
         pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3')
+        depends=('koffice-kspread' 'oxygen-icons')
+	install=koffice.install
         cd "${srcdir}/build/kexi"
         make DESTDIR="${pkgdir}" install
 }
@@ -162,7 +167,8 @@ package_koffice-kexi-doc(){
 
 package_koffice-kformula(){
         pkgdesc="Formula editor for the KDE office suite"
-		depends=('kdelibs' 'koffice-libs')
+	depends=('koffice-libs')
+	install=koffice.install
         cd "${srcdir}/build/kformula"
         make DESTDIR="${pkgdir}" install
 }
@@ -176,15 +182,14 @@ package_koffice-kformula-doc() {
 
 package_koffice-kounavail(){
 	pkgdesc="Kounavail for the KDE office suite"
-	depends=('kdelibs' 'koffice-libs')
+	depends=('koffice-libs')
         cd "${srcdir}/build/kounavail"
         make DESTDIR="${pkgdir}" install
 }
 
 package_koffice-kplato(){
 	pkgdesc="Project management application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \
-		'koffice-plugins' 'koffice-kword')
+	depends=('koffice-kword' 'oxygen-icons')
 	install=koffice.install
         cd "${srcdir}/build/kplato"
         make DESTDIR="${pkgdir}" install
@@ -198,7 +203,7 @@ package_koffice-kplato(){
 
 package_koffice-kpresenter(){
 	pkgdesc="Presentation tool for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
+	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
         optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd "${srcdir}/build/kpresenter"
@@ -213,10 +218,9 @@ package_koffice-kpresenter-doc(){
 
 package_koffice-krita(){
 	pkgdesc="Graphics editor for KDE"
-	depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \
-		'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \
-		'openexr' 'opengtl')
-        optdepends=('koffice-filters: import/export filters')
+	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
+		 'koffice-plugins' 'poppler-qt' 'opengtl')
+        optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
 	install=krita.install
         cd "${srcdir}/build/krita"
         make DESTDIR="${pkgdir}" install
@@ -231,7 +235,7 @@ package_koffice-krita(){
 
 package_koffice-kspread(){
 	pkgdesc="Spreadsheet application for KDE"
-	depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins')
+	depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
 	optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
         cd "${srcdir}/build/kspread"
@@ -246,7 +250,7 @@ package_koffice-kspread-doc(){
 
 package_koffice-kword(){
 	pkgdesc="Wordprocessor for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \
+	depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
 		'koffice-kounavail' 'koffice-plugins')
         optdepends=('koffice-filters: import/export filters')
 	install=koffice.install
diff --git a/extra/koffice/koffice.install b/extra/koffice/koffice.install
index e70c054ec..6c87527e2 100644
--- a/extra/koffice/koffice.install
+++ b/extra/koffice/koffice.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/koffice/krita.install b/extra/koffice/krita.install
index ce5c32e1b..5d458de55 100644
--- a/extra/koffice/krita.install
+++ b/extra/koffice/krita.install
@@ -1,6 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
@@ -9,4 +10,4 @@ post_upgrade() {
 
 post_remove() {
 	post_install
-}
-\ No newline at end of file
+}
diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD
index fb65acc74..b5dd98216 100644
--- a/extra/libhangul/PKGBUILD
+++ b/extra/libhangul/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 110870 2011-02-22 20:13:14Z bisson $
+# $Id: PKGBUILD 140549 2011-10-17 07:24:10Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libhangul
-pkgver=0.0.12
-pkgrel=2
-_filecode=5855
+pkgver=0.1.0
+pkgrel=1
+_filecode=6000
 pkgdesc='Input method library for Korean'
 arch=('i686' 'x86_64')
 url='http://kldp.net/projects/hangul/'
 license=('LGPL')
 options=('!libtool')
-source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tgz")
-sha1sums=('5e02fe61c8f51ace03bebb1ec75875a2262e3cd5')
+DLAGENTS=("http::/usr/bin/curl -A '' -fLC - --retry 3 --retry-delay 3 -o %o %u") # moronic httpd bans curl's user-agent
+source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 92f5cb6d6..15b67b82a 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 138502 2011-09-25 14:55:46Z andyrtr $
+# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -37,7 +37,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.3.2
 pkgver=3.4.3
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -45,7 +45,7 @@ license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
-             'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment'
               #'saxon' - currently broken 
@@ -53,7 +53,7 @@ makedepends=( # makedepends
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' #'libgraphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script
 	     'ttf-dejavu') # to satisfy regression tests
 	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
 # http://download.documentfoundation.org/mirrors/all.html
@@ -105,7 +105,13 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff)
+	scp2-more-reasonable-file-access-rights.diff
+	java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842
+	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
+	poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe
+	pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b
+	poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b
+	build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -206,7 +212,13 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9')
+         '37638431e7e40baf2e47966ebb9bc0e9'
+         'ca6032e86229ae798f3744ae244f5bfe'
+         '3c6c62e77c30649a3dfe73512947cc9a'
+         '64497be966802e62ffe3282d3facf7b7'
+         '89ff871e77e10357a976fe9d1ab3a65a'
+         'c4cb0d7f2602396a3f4cac55b8a4e308'
+         'b8f1fb7f3902d22aeaa2575c6b08a62c')
 
 build() {
 
@@ -236,6 +248,12 @@ build() {
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
+	patch -Np1 -i ${srcdir}/java-detection.diff
+	patch -Np1 -i ${srcdir}/oracle-recognition.diff
+	patch -Np1 -i ${srcdir}/poppler-check.diff
+	patch -Np1 -i ${srcdir}/pdfimport.diff
+	patch -Np1 -i ${srcdir}/poppler-buildfix.diff
+	patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -376,7 +394,7 @@ package_libreoffice-common() {
  depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
           'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
           'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script 
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
 	  #'java-runtime' 
           #'saxon'
  optdepends=('libreoffice-langpack: additional language support'
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index accbd157d..21c1c51b8 100644
--- a/extra/liquidwar/PKGBUILD
+++ b/extra/liquidwar/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 63784 2010-01-18 15:14:56Z ibiru $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Jason Chu <jason@archlinux.org>
+# $Id: PKGBUILD 140692 2011-10-18 03:46:14Z eric $
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 
 pkgname=liquidwar
 pkgver=5.6.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A unique multiplayer wargame"
 arch=('i686' 'x86_64')
 url="http://www.ufoot.org/liquidwar/"
 license=('GPL')
-depends=('allegro>=4.4.0.1')
-makedepends=('python')
+depends=('allegro4')
+makedepends=('python2')
 install=liquidwar.install
-source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('6917dd1026e6685404ffbd086f8ba374')
-sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6')
+source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
+        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig)
+sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
+          'a262967d60e0f04ac5b99693144ef6b0038bb6c4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's/python/python2/' doc/Makefile.in
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
-  ./configure --prefix=/usr --disable-doc-ps --disable-doc-pdf --disable-doc-php3 $EXTRAOPTS || return 1
-  sed -i 's|$(EXTERN_LIBS)|$(EXTERN_LIBS) -lm|' src/Makefile || return 1
-  make GAMEDIR=/usr/bin DATADIR=/usr/share/$pkgname || return 1
-  make DESTDIR="$pkgdir" DATADIR=/usr/share/$pkgname install || return 1
-  mv "$pkgdir"/usr/games/* "$pkgdir/usr/bin/"
-  rmdir "${pkgdir}/usr/games"
+  LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+  make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
 }
diff --git a/extra/liquidwar/liquidwar.install b/extra/liquidwar/liquidwar.install
index e864e83ea..9c98acbc7 100644
--- a/extra/liquidwar/liquidwar.install
+++ b/extra/liquidwar/liquidwar.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 file=(liquidwar.info.gz)
 
 post_install() {
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index 103eae831..79f265f48 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 106797 2011-01-19 09:42:18Z bisson $
+# $Id: PKGBUILD 140555 2011-10-17 07:25:46Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 
 pkgname=m17n-lib
-pkgver=1.6.2
-pkgrel=2
-pkgdesc='A multilingual text processing library (runtimes)'
+pkgver=1.6.3
+pkgrel=1
+pkgdesc='Multilingual text processing library (runtimes)'
 arch=('i686' 'x86_64')
 url='http://www.m17n.org/m17n-lib/'
 license=('GPL')
-depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf>=0.9.11')
+depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
 optdepends=('anthy: to use the anthy input method')
-options=('!libtool' '!makeflags')
-source=("http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz"
-        'locale.patch')
-sha1sums=('9b9ada79357dd56c90c64cd36845c5537c363d79'
-          '55a09b9d8e6ea590d5c8f06d1397bfa0b00c1697')
+options=('!libtool' '!emptydirs')
+source=("http://www.m17n.org/m17n-lib-download/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i ../locale.patch # cf. FS#20482
-  ./configure --prefix=/usr
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --enable-static=no
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 13a4df9e5..3aad52a3b 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135802 2011-08-18 15:04:35Z andyrtr $
+# $Id: PKGBUILD 140559 2011-10-17 07:57:05Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Ben Mazer <blm@groknil.org>
 
 pkgname=msmtp
-pkgver=1.4.24
-pkgrel=3
+pkgver=1.4.25
+pkgrel=1
 pkgdesc="A mini smtp client"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -14,7 +14,7 @@ makedepends=('texlive-core')
 provides=('smtp-forwarder')
 install=msmtp.install
 source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba')
+md5sums=('2d9603a7b5c1ebd83ea289ac2aa3a634')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index a265af7a1..95e04efaa 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 99851 2010-11-18 20:52:23Z andrea $
+# $Id: PKGBUILD 140672 2011-10-18 02:34:13Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=openbabel
-pkgver=2.3.0
-pkgrel=3
-pkgdesc="A library designed to interconvert between many file formats used in \
-molecular modeling and computational chemistry"
+pkgver=2.3.1
+pkgrel=1
+pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry"
 arch=('i686' 'x86_64')
 url="http://openbabel.org/wiki/Main_Page"
 license=('GPL')
@@ -16,10 +15,10 @@ optdepends=('eigen: to use bindings'
         'wxgtk: GUI interface')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('effda01ed4a31d18d8e3d08191799608')
+md5sums=('1f029b0add12a3b55582dc2c832b04f8')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -29,6 +28,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index acb5e1164..6c9dd0e62 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 137658 2011-09-10 10:56:37Z pierre $
+# $Id: PKGBUILD 140587 2011-10-17 08:15:19Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.16.7
-pkgrel=2
+pkgver=0.18.0
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
-options=('!libtool')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('3afa28e3c8c4f06b0fbca3c91e06394e')
+md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -29,7 +29,7 @@ build() {
 
 package_poppler() {
   pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
+  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
   conflicts=("poppler-qt3<${pkgver}")
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -42,7 +42,7 @@ package_poppler() {
 
 package_poppler-glib() {
   pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'gtk2')
+  depends=("poppler=${pkgver}" 'glib2')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
   make DESTDIR="${pkgdir}" install-libLTLIBRARIES
@@ -51,6 +51,7 @@ package_poppler-glib() {
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
   rm -f "${pkgdir}"/usr/lib/libpoppler.*
+  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
 }
 
 package_poppler-qt() {
diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
index 61497abd3..37376fedd 100644
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ b/extra/qtcurve-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130208 2011-07-04 08:59:54Z andrea $
+# $Id: PKGBUILD 140659 2011-10-17 19:15:55Z ronald $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-gtk2
-pkgver=1.8.9
+pkgver=1.8.11
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -14,7 +14,7 @@ depends=('gtk2')
 makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-md5sums=('e3248bd1b926f250b3a6ff9699134abd')
+sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c')
 
 build() {
 	cd "${srcdir}"
diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD
index 05191b22b..cf5716603 100644
--- a/extra/qtcurve-kde4/PKGBUILD
+++ b/extra/qtcurve-kde4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130203 2011-07-04 08:57:57Z andrea $
+# $Id: PKGBUILD 140653 2011-10-17 18:59:52Z ronald $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qtcurve-kde4
-pkgver=1.8.8
+pkgver=1.8.9
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -14,9 +14,8 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
         'bypass-kde-config.patch')
-md5sums=('b264d80b4c1e0e8d59e91d571cb639e4'
-         '3f6681147cc361bd2bfd4d7477f2a8d0')
-
+sha1sums=('93bc8ce3e5bed506521a8839a254f7076b4bc988'
+          '8005c8bf0e9c5d75e80b417a01513bd45853274c')
 build() {
 	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
 	# Bypass KDE prefix detection by kde4-config, see:
diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD
index ee612c62e..527151486 100644
--- a/extra/scim-hangul/PKGBUILD
+++ b/extra/scim-hangul/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111080 2011-02-23 22:13:26Z bisson $
+# $Id: PKGBUILD 140551 2011-10-17 07:24:46Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-hangul
 pkgver=0.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Korean input method module for SCIM'
 arch=('i686' 'x86_64')
 url='http://www.scim-im.org/'
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 66873bff2..7c87faf38 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 139427 2011-10-01 19:01:16Z ibiru $
+# $Id: PKGBUILD 140590 2011-10-17 08:52:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://projects.gnome.org/seahorse/"
 depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
 makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
+optdepends=('openssh: SSH support')
+provides=('x11-ssh-askpass')
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        seahorse-ssh-askpass.sh)
+sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7'
+            '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-ldap --enable-hkp \
@@ -29,6 +33,8 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
+    "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
 }
diff --git a/extra/seahorse/seahorse-ssh-askpass.sh b/extra/seahorse/seahorse-ssh-askpass.sh
new file mode 100644
index 000000000..44281ac2b
--- /dev/null
+++ b/extra/seahorse/seahorse-ssh-askpass.sh
@@ -0,0 +1,3 @@
+if [ -z "$SSH_ASKPASS" ]; then
+  export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
+fi
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 0130a76a8..d9b62ca2d 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139445 2011-10-01 19:01:47Z ibiru $
+# $Id: PKGBUILD 140581 2011-10-17 08:15:06Z jgc $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.12.3
+pkgver=0.12.5
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -15,12 +15,11 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
              'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
              'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
              'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'evolution' 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac'
-             'vala')
+             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('97c9e151d48878409129eeeea2da0716f14a52d6097d8db3b304c6af0b7ae187')
+sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -44,7 +43,6 @@ package_tracker() {
   optdepends=('giflib: extractor for GIF data'
               'gstreamer0.10-base: video extractor'
               'totem-plparser: playlist support'
-              'evolution: Evolution email data miner'
               'nautilus: nautilus-extension'
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index ffefa7234..b18e5e01d 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 138679 2011-09-27 15:18:13Z tpowa $
+# $Id: PKGBUILD 140583 2011-10-17 08:15:09Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
 pkgver=0.1.22
-pkgrel=2
+pkgrel=3
 pkgdesc="D-Bus service for applications to request thumbnails"
 url="http://git.xfce.org/xfce/tumbler/"
 license=('GPL2' 'LGPL')
 arch=('i686' 'x86_64')
 groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib')
-makedepends=('intltool' 'ffmpegthumbnailer')
+depends=('poppler-glib' 'dbus-glib' 'bzip2' 'gdk-pixbuf2')
+makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
 optdepends=('ffmpegthumbnailer:	for video thumbnails'
             'gstreamer0.10: for video thumbnails')
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2
         fix-video-image.patch)
+md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9'
+         'be9b0f1c3a4b0be102774c84d5ac29e6')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ../fix-video-image.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -30,8 +32,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9'
-         'be9b0f1c3a4b0be102774c84d5ac29e6')
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD
index 480cdcaa7..91d85103c 100644
--- a/extra/xf86-video-vesa/PKGBUILD
+++ b/extra/xf86-video-vesa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140288 2011-10-11 21:28:18Z jgc $
+# $Id: PKGBUILD 140592 2011-10-17 09:55:09Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vesa
 pkgver=2.3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,13 +14,16 @@ conflicts=('xorg-server<1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
+        git-fixes.patch
+        revert-kernelcheck.patch)
 sha1sums=('4689b7c295d7a8d7326302dafecb812739617134'
-          '1e54ae50daa796ab0c29c8088f25e522dc6faa4a')
+          '1e54ae50daa796ab0c29c8088f25e522dc6faa4a'
+          'c14454521ac91aaa08aad8a6025d7720a613d54b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-fixes.patch"
+  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
   autoreconf -fi
   ./configure --prefix=/usr
   make
diff --git a/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch
new file mode 100644
index 000000000..c4f442265
--- /dev/null
+++ b/extra/xf86-video-vesa/git-fixes.patch
@@ -0,0 +1,444 @@
+diff --git a/COPYING b/COPYING
+index 22b4b13..f101fb8 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,4 +1,5 @@
+ Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
++Copyright 2008 Red Hat, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+diff --git a/configure.ac b/configure.ac
+index ff4713d..2e4f542 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,45 +20,44 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-vesa],
+-        2.3.0,
++        [2.3.0],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-        xf86-video-vesa)
+-
++        [xf86-video-vesa])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
+                              [ moduledir="$withval" ],
+                              [ moduledir="$libdir/xorg/modules" ])
+ AC_SUBST(moduledir)
+ 
+-
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+@@ -93,21 +92,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+-AC_SUBST([CFLAGS])
+-AC_SUBST([INCLUDES])
+-
+ # Checks for libraries.
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+ DRIVER_NAME=vesa
+ AC_SUBST([DRIVER_NAME])
+ 
+-AC_OUTPUT([
+-	Makefile
+-	src/Makefile
+-	man/Makefile
++AC_CONFIG_FILES([
++                Makefile
++                src/Makefile
++                man/Makefile
+ ])
++AC_OUTPUT
+diff --git a/man/Makefile.am b/man/Makefile.am
+index f0eb29b..b3688ce 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,27 +1,24 @@
+ #
+ # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+-# 
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation.
+-# 
+-# 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 OPEN GROUP 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.
+-# 
+-# Except as contained in this notice, the name of the copyright holders shall
+-# not be used in advertising or otherwise to promote the sale, use or
+-# other dealings in this Software without prior written authorization
+-# from the copyright holders.
++#
++# 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 (including the next
++# paragraph) 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.
+ # 
+ 
+ drivermandir = $(DRIVER_MAN_DIR)
+@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+ 
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+ 
+-MAN_SUBSTS = \
+-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|$(prefix)|g' \
+-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-	sed $(MAN_SUBSTS) < $< > $@
++	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+diff --git a/man/vesa.man b/man/vesa.man
+index 19cb766..ce4b369 100644
+--- a/man/vesa.man
++++ b/man/vesa.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ 
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH VESA __drivermansuffix__ __vendorversion__
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 88da8a2..dc702f0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,6 +24,9 @@
+ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
++
++AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
++
+ vesa_drv_la_LTLIBRARIES = vesa_drv.la
+ vesa_drv_la_LDFLAGS = -module -avoid-version
+ vesa_drv_ladir = @moduledir@/drivers
+diff --git a/src/vesa.c b/src/vesa.c
+index 034a019..61d3550 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -281,7 +281,7 @@ static VESAPtr
+ VESAGetRec(ScrnInfoPtr pScrn)
+ {
+     if (!pScrn->driverPrivate)
+-	pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1);
++	pScrn->driverPrivate = calloc(sizeof(VESARec), 1);
+ 
+     return ((VESAPtr)pScrn->driverPrivate);
+ }
+@@ -296,7 +296,7 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
+ 
+     data = (VbeModeInfoData *)vbemode->Private;
+ 
+-    data->block = xcalloc(sizeof(VbeCRTCInfoBlock), 1);
++    data->block = calloc(sizeof(VbeCRTCInfoBlock), 1);
+     data->block->HorizontalTotal = ddcmode->HTotal;
+     data->block->HorizontalSyncStart = ddcmode->HSyncStart;
+     data->block->HorizontalSyncEnd = ddcmode->HSyncEnd;
+@@ -317,6 +317,30 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
+ 				(double)(ddcmode->HTotal * ddcmode->VTotal));
+ }
+ 
++/*
++ * Despite that VBE gives you pixel granularity for mode sizes, some BIOSes
++ * think they can only give sizes in multiples of character cells; and
++ * indeed, the reference CVT and GTF formulae only give results where
++ * (h % 8) == 0.  Whatever, let's just try to cope.  What we're looking for
++ * here is cases where the display says 1366x768 and the BIOS says 1360x768.
++ */
++static Bool
++vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr vbe)
++{
++    if (!(edid->type & M_T_DRIVER))
++	return FALSE;
++
++    /* never seen a height granularity... */
++    if (edid->VDisplay != vbe->VDisplay)
++	return FALSE;
++
++    if (edid->HDisplay >= vbe->HDisplay &&
++	(edid->HDisplay & ~7) == (vbe->HDisplay & ~7))
++	return TRUE;
++
++    return FALSE;
++}
++
+ static ModeStatus
+ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
+ {
+@@ -358,9 +382,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
+ 	 */
+ 	if (pScrn->monitor->DDC) {
+ 	    for (mode = pScrn->monitor->Modes; mode; mode = mode->next) {
+-		if (mode->type & M_T_DRIVER && 
+-			mode->HDisplay == p->HDisplay &&
+-			mode->VDisplay == p->VDisplay) {
++		if (vesaModesCloseEnough(mode, p)) {
+ 		    if (xf86CheckModeForMonitor(mode, mon) == MODE_OK) {
+ 			found = 1;
+ 			break;
+@@ -391,7 +413,8 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
+     for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) {
+ 	mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0);
+ 	ret = xf86CheckModeForMonitor(mode, mon);
+-	xfree(mode);
++	free(mode->name);
++	free(mode);
+ 	if (ret == MODE_OK)
+ 	    break;
+     }
+@@ -431,8 +454,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
+     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
+ 				NULL, NULL, NULL, NULL, NULL);
+     if (pScrn != NULL) {
+-	VESAPtr pVesa = VESAGetRec(pScrn);
++	VESAPtr pVesa;
++
++	if (pci_device_has_kernel_driver(dev)) {
++	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
++	    return FALSE;
++	}
+ 
++	pVesa = VESAGetRec(pScrn);
+ 	VESAInitScrn(pScrn);
+ 	pVesa->pciInfo = dev;
+     }
+@@ -480,7 +509,7 @@ VESAProbe(DriverPtr drv, int flags)
+ 		    }
+ 		}
+ 	    }
+-	    xfree(usedChips);
++	    free(usedChips);
+ 	}
+     }
+ #endif
+@@ -503,11 +532,11 @@ VESAProbe(DriverPtr drv, int flags)
+ 		foundScreen = TRUE;
+ 	    }
+ 	}
+-	xfree(usedChips);
++	free(usedChips);
+     }
+ #endif
+ 
+-    xfree(devSections);
++    free(devSections);
+ 
+     return (foundScreen);
+ }
+@@ -554,9 +583,9 @@ VESAFreeRec(ScrnInfoPtr pScrn)
+ 		VbeModeInfoData *data = (VbeModeInfoData*)mode->Private;
+ 
+ 		if (data->block)
+-		    xfree(data->block);
++		    free(data->block);
+ 
+-		xfree(data);
++		free(data);
+ 
+ 		mode->Private = NULL;
+ 	    }
+@@ -564,12 +593,12 @@ VESAFreeRec(ScrnInfoPtr pScrn)
+ 	} while (mode && mode != pScrn->modes);
+     }
+ #endif
+-    xfree(pVesa->monitor);
+-    xfree(pVesa->vbeInfo);
+-    xfree(pVesa->pal);
+-    xfree(pVesa->savedPal);
+-    xfree(pVesa->fonts);
+-    xfree(pScrn->driverPrivate);
++    free(pVesa->monitor);
++    free(pVesa->vbeInfo);
++    free(pVesa->pal);
++    free(pVesa->savedPal);
++    free(pVesa->fonts);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -712,7 +741,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
+     else {
+ 	void *panelid = VBEReadPanelID(pVesa->pVbe);
+ 	VBEInterpretPanelID(pScrn->scrnIndex, panelid);
+-	xfree(panelid);
++	free(panelid);
+     }
+ #endif
+ 
+@@ -805,7 +834,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+     /* options */
+     xf86CollectOptions(pScrn, NULL);
+-    if (!(pVesa->Options = xalloc(sizeof(VESAOptions)))) {
++    if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) {
+         vbeFree(pVesa->pVbe);
+ 	return FALSE;
+     }
+@@ -940,7 +969,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	pScrn->bitsPerPixel = 8;
+ 
+     if (pVesa->shadowFB) {
+-	pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY *
++	pVesa->shadow = calloc(1, pScrn->displayWidth * pScrn->virtualY *
+ 				   ((pScrn->bitsPerPixel + 7) / 8));
+ 	if (!pVesa->shadow) {
+ 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+@@ -1119,10 +1148,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen)
+     }
+     if (pVesa->shadowFB && pVesa->shadow) {
+ 	shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
+-	xfree(pVesa->shadow);
++	free(pVesa->shadow);
+     }
+     if (pVesa->pDGAMode) {
+-	xfree(pVesa->pDGAMode);
++	free(pVesa->pDGAMode);
+ 	pVesa->pDGAMode = NULL;
+ 	pVesa->nDGAMode = 0;
+     }
+@@ -1180,7 +1209,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
+ 	     * Free it as it will not be any longer useful
+ 	     */
+ 	    xf86ErrorF(", mode set without customized refresh.\n");
+-	    xfree(data->block);
++	    free(data->block);
+ 	    data->block = NULL;
+ 	    data->mode &= ~(1 << 11);
+ 	}
+@@ -1315,7 +1344,7 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+     int base;
+ 
+     if (pVesa->pal == NULL)
+-	pVesa->pal = xcalloc(1, sizeof(CARD32) * 256);
++	pVesa->pal = calloc(1, sizeof(CARD32) * 256);
+ 
+     for (i = 0, base = idx = indices[i]; i < numColors; i++, idx++) {
+ 	int j = indices[i];
+@@ -1414,7 +1443,7 @@ SaveFonts(ScrnInfoPtr pScrn)
+     if (attr10 & 0x01)
+ 	return;
+ 
+-    pVesa->fonts = xalloc(16384);
++    pVesa->fonts = malloc(16384);
+ 
+     /* save the registers that are needed here */
+     miscOut = ReadMiscOut();
+@@ -1622,7 +1651,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
+ 		&& function == MODE_SAVE) {
+ 	        /* don't rely on the memory not being touched */
+ 	        if (pVesa->pstate == NULL)
+-		    pVesa->pstate = xalloc(pVesa->stateSize);
++		    pVesa->pstate = malloc(pVesa->stateSize);
+ 		memcpy(pVesa->pstate, pVesa->state, pVesa->stateSize);
+ 	    }
+ 	}
+@@ -1737,7 +1766,7 @@ VESADGAAddModes(ScrnInfoPtr pScrn)
+     DGAModePtr pDGAMode;
+ 
+     do {
+-	pDGAMode = xrealloc(pVesa->pDGAMode,
++	pDGAMode = realloc(pVesa->pDGAMode,
+ 			    (pVesa->nDGAMode + 1) * sizeof(DGAModeRec));
+ 	if (!pDGAMode)
+ 	    break;
+diff --git a/src/vesa.h b/src/vesa.h
+index 4656e4c..89245b9 100644
+--- a/src/vesa.h
++++ b/src/vesa.h
+@@ -25,8 +25,6 @@
+  * Conectiva Linux.
+  *
+  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+- *
+- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $
+  */
+ 
+ #ifndef _VESA_H_
diff --git a/extra/xf86-video-vesa/revert-kernelcheck.patch b/extra/xf86-video-vesa/revert-kernelcheck.patch
new file mode 100644
index 000000000..37418cc3f
--- /dev/null
+++ b/extra/xf86-video-vesa/revert-kernelcheck.patch
@@ -0,0 +1,31 @@
+From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 08 Dec 2010 18:45:32 +0000
+Subject: Refuse to load if there's a kernel driver bound to the device
+
+Ported from the equivalent check in nv.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 168fde1..2523d76 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
+     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
+ 				NULL, NULL, NULL, NULL, NULL);
+     if (pScrn != NULL) {
+-	VESAPtr pVesa = VESAGetRec(pScrn);
++	VESAPtr pVesa;
+ 
++	if (pci_device_has_kernel_driver(dev)) {
++	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
++	    return FALSE;
++	}
++
++	pVesa = VESAGetRec(pScrn);
+ 	VESAInitScrn(pScrn);
+ 	pVesa->pciInfo = dev;
+     }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xournal/PKGBUILD b/extra/xournal/PKGBUILD
index e9c825e26..79f6f7c93 100644
--- a/extra/xournal/PKGBUILD
+++ b/extra/xournal/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 108182 2011-01-30 14:22:10Z ibiru $
-# Contributor: 
-# Maintainer: 
+# $Id: PKGBUILD 140585 2011-10-17 08:15:15Z jgc $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=xournal
 pkgver=0.4.5
-pkgrel=4
+pkgrel=5
 pkgdesc='Notetaking and sketching application'
 arch=('i686' 'x86_64')
 url='http://xournal.sourceforge.net/'
 license=('GPL')
 depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
-install=xournal.install
 source=("http://downloads.sourceforge.net/xournal/xournal-${pkgver}.tar.gz"
-        'pdf-export-64.patch')
+        'pdf-export-64.patch'
+        'poppler-api.patch')
 sha1sums=('390cb275774469ed1b04b7268dd625bd456c895e'
-          'f23f53b9f69ba8a5773c53d7bca99abf9d8504f8')
+          'f23f53b9f69ba8a5773c53d7bca99abf9d8504f8'
+          '5aedd5610b42df96e964bb889d4bf0831c2080bc')
 
+install=install
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -p1 < ../pdf-export-64.patch # from xournal CVS, see FS#21693
-    ./configure --prefix=/usr
-    make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../pdf-export-64.patch # from xournal CVS, see FS#21693
+	patch -p1 -i ../poppler-api.patch
+
+	./configure --prefix=/usr
+	make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install desktop-install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install desktop-install
 }
diff --git a/extra/xournal/install b/extra/xournal/install
new file mode 100644
index 000000000..dfcb68374
--- /dev/null
+++ b/extra/xournal/install
@@ -0,0 +1,13 @@
+post_install() {
+	update-desktop-database -q
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	update-mime-database usr/share/mime &>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/xournal/poppler-api.patch b/extra/xournal/poppler-api.patch
new file mode 100644
index 000000000..9e33c7feb
--- /dev/null
+++ b/extra/xournal/poppler-api.patch
@@ -0,0 +1,158 @@
+diff -aur old/src/xo-file.c new/src/xo-file.c
+--- old/src/xo-file.c	2009-09-29 09:36:05.000000000 +1000
++++ new/src/xo-file.c	2011-10-06 03:11:17.307822836 +1100
+@@ -975,6 +975,140 @@
+   g_free(req);
+ }
+ 
++/*
++ * Copied from http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617
++ * as a temporary workaround to poppler removing depreciated functions while we wait for
++ * upstream to rewrite against cairo
++ */
++static void
++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf)
++{
++  int cairo_width, cairo_height, cairo_rowstride;
++  unsigned char *pixbuf_data, *dst, *cairo_data;
++  int pixbuf_rowstride, pixbuf_n_channels;
++  unsigned int *src;
++  int x, y;
++
++  cairo_width = cairo_image_surface_get_width (surface);
++  cairo_height = cairo_image_surface_get_height (surface);
++  cairo_rowstride = cairo_image_surface_get_stride (surface);
++  cairo_data = cairo_image_surface_get_data (surface);
++
++  pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
++  pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
++  pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
++
++  if (cairo_width > gdk_pixbuf_get_width (pixbuf))
++    cairo_width = gdk_pixbuf_get_width (pixbuf);
++  if (cairo_height > gdk_pixbuf_get_height (pixbuf))
++    cairo_height = gdk_pixbuf_get_height (pixbuf);
++  for (y = 0; y < cairo_height; y++)
++    {
++      src = (unsigned int *) (cairo_data + y * cairo_rowstride);
++      dst = pixbuf_data + y * pixbuf_rowstride;
++      for (x = 0; x < cairo_width; x++)
++	{
++	  dst[0] = (*src >> 16) & 0xff;
++	  dst[1] = (*src >> 8) & 0xff;
++	  dst[2] = (*src >> 0) & 0xff;
++	  if (pixbuf_n_channels == 4)
++	      dst[3] = (*src >> 24) & 0xff;
++	  dst += pixbuf_n_channels;
++	  src++;
++	}
++    }
++}
++
++static void
++_poppler_page_render_to_pixbuf (PopplerPage *page,
++				int src_x, int src_y,
++				int src_width, int src_height,
++				double scale,
++				int rotation,
++				gboolean printing,
++				GdkPixbuf *pixbuf)
++{
++  cairo_t *cr;
++  cairo_surface_t *surface;
++
++  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
++					src_width, src_height);
++  cr = cairo_create (surface);
++  cairo_save (cr);
++  switch (rotation) {
++  case 90:
++	  cairo_translate (cr, src_x + src_width, -src_y);
++	  break;
++  case 180:
++	  cairo_translate (cr, src_x + src_width, src_y + src_height);
++	  break;
++  case 270:
++	  cairo_translate (cr, -src_x, src_y + src_height);
++	  break;
++  default:
++	  cairo_translate (cr, -src_x, -src_y);
++  }
++
++  if (scale != 1.0)
++	  cairo_scale (cr, scale, scale);
++
++  if (rotation != 0)
++	  cairo_rotate (cr, rotation * G_PI / 180.0);
++
++  if (printing)
++	  poppler_page_render_for_printing (page, cr);
++  else
++	  poppler_page_render (page, cr);
++  cairo_restore (cr);
++
++  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
++  cairo_set_source_rgb (cr, 1., 1., 1.);
++  cairo_paint (cr);
++
++  cairo_destroy (cr);
++
++  copy_cairo_surface_to_pixbuf (surface, pixbuf);
++  cairo_surface_destroy (surface);
++}
++
++/**
++ * poppler_page_render_to_pixbuf:
++ * @page: the page to render from
++ * @src_x: x coordinate of upper left corner
++ * @src_y: y coordinate of upper left corner
++ * @src_width: width of rectangle to render
++ * @src_height: height of rectangle to render
++ * @scale: scale specified as pixels per point
++ * @rotation: rotate the document by the specified degree
++ * @pixbuf: pixbuf to render into
++ *
++ * First scale the document to match the specified pixels per point,
++ * then render the rectangle given by the upper left corner at
++ * (src_x, src_y) and src_width and src_height.
++ * This function is for rendering a page that will be displayed.
++ * If you want to render a page that will be printed use
++ * poppler_page_render_to_pixbuf_for_printing() instead
++ *
++ * Deprecated: 0.16
++ **/
++void
++poppler_page_render_to_pixbuf (PopplerPage *page,
++			       int src_x, int src_y,
++			       int src_width, int src_height,
++			       double scale,
++			       int rotation,
++			       GdkPixbuf *pixbuf)
++{
++  g_return_if_fail (POPPLER_IS_PAGE (page));
++  g_return_if_fail (scale > 0.0);
++  g_return_if_fail (pixbuf != NULL);
++
++  _poppler_page_render_to_pixbuf (page, src_x, src_y,
++				  src_width, src_height,
++				  scale, rotation,
++				  FALSE,
++				  pixbuf);
++}
+ /* process a bg PDF request from the queue, and recurse */
+ 
+ gboolean bgpdf_scheduler_callback(gpointer data)
+diff -aur old/src/xo-file.h new/src/xo-file.h
+--- old/src/xo-file.h	2009-09-28 08:45:53.000000000 +1000
++++ new/src/xo-file.h	2011-10-06 03:11:17.311156160 +1100
+@@ -36,3 +36,10 @@
+ void init_config_default(void);
+ void load_config_from_file(void);
+ void save_config_to_file(void);
++
++void poppler_page_render_to_pixbuf (PopplerPage *page,
++					       int src_x, int src_y,
++					       int src_width, int src_height,
++					       double scale,
++					       int rotation,
++					       GdkPixbuf *pixbuf);
diff --git a/libre/virtualbox/10-vboxdrv.rules b/libre/virtualbox/10-vboxdrv.rules
new file mode 100644
index 000000000..a6cfe0a05
--- /dev/null
+++ b/libre/virtualbox/10-vboxdrv.rules
@@ -0,0 +1,6 @@
+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/libre/virtualbox/18-system-xorg.patch b/libre/virtualbox/18-system-xorg.patch
new file mode 100644
index 000000000..baca4bc5b
--- /dev/null
+++ b/libre/virtualbox/18-system-xorg.patch
@@ -0,0 +1,278 @@
+Description: Build the X.Org driver only for the selected system X Server version.
+Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>
+
+diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
++++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+@@ -40,8 +40,8 @@ LIBRARIES += \
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+-  LIBRARIES += \
+-  	VBoxGuestR3LibXFree86
++#  LIBRARIES += \
++#  	VBoxGuestR3LibXFree86
+  endif
+ endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
+diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
++++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
+ VBoxOGL_INCS           = .
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+  VBoxOGL_INCS     += \
+-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
+-	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
+-	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
+-	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
+-	$(VBOX_PATH_X11_ROOT)/1.3/xorg \
++	/usr/include/x11 \
++	/usr/include/xorg \
++	/usr/include/pixman-1 \
+ 	$(VBOX_MESA_INCS) \
+-	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
++	/usr/include/drm \
++	/usr/include/libdrm
+  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
+ endif
+ 
+diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
+--- a/src/VBox/Additions/x11/Makefile.kmk
++++ b/src/VBox/Additions/x11/Makefile.kmk
+@@ -17,6 +17,10 @@
+ SUB_DEPTH = ../../../..
+ include $(KBUILD_PATH)/subheader.kmk
+ 
++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
++ XSERVER_VERSION := 17
++endif
++
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+@@ -23,7 +23,6 @@ include	$(KBUILD_PATH)/subheader.kmk
+ # vboxmouse_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxmouse_drv
+  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+  vboxmouse_drv_DEFS.linux = linux
+  vboxmouse_drv_DEFS.x86 += __i386__
+@@ -59,7 +58,6 @@ endif
+ #
+ # vboxmouse_drv_70
+ #
+-DLLS += vboxmouse_drv_70
+ vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_70_DEFS = \
+ 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
+@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
+ #
+ # vboxmouse_drv_71
+ #
+-DLLS += vboxmouse_drv_71
+ vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
+ vboxmouse_drv_71_INCS := \
+@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
+ #
+ # vboxmouse_drv_13
+ #
+-DLLS += vboxmouse_drv_13
+ vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_13_INCS := \
+@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
+ #
+ # vboxmouse_drv_14
+ #
+-DLLS += vboxmouse_drv_14
+ vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_14_INCS := \
+@@ -126,7 +121,6 @@ endif
+ #
+ # vboxmouse_drv_15
+ #
+-DLLS += vboxmouse_drv_15
+ vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_15_INCS := \
+@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
+ #
+ # vboxmouse_drv_16
+ #
+-DLLS += vboxmouse_drv_16
+ vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_16_INCS := \
+@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
+ #
+ # vboxmouse_drv_17
+ #
+-DLLS += vboxmouse_drv_17
+ vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
+ #
+ # vboxmouse_drv_18
+ #
+-DLLS += vboxmouse_drv_18
+ vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
+ #
+ # vboxmouse_drv_19
+ #
+-DLLS += vboxmouse_drv_19
+ vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
+ #
+ # vboxmouse_drv_110
+ #
+-DLLS += vboxmouse_drv_110
+ vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
+ 	vboxmouse_15.c
+ 
+ 
++vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
++vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
++	/usr/include/x11 \
++	/usr/include/xorg \
++	/usr/include/pixman-1
++DLLS += vboxmouse_drv_$(XSERVER_VERSION)
++
++
+ # Check the undefined symbols in the X.Org modules against lists of allowed
+ # symbols.  Not very elegant, but it will catch problems early.
+ ifdef VBOX_WITH_TESTCASES
+diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -22,7 +22,6 @@ include	$(KBUILD_PATH)/subheader.kmk
+ # vboxvideo_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxvideo_drv
+ endif   # target linux
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+@@ -89,7 +88,6 @@ endif   # target linux
+ #         base keywords instead of using .solaris or .linux.
+ #         Also it is *important* to use := and not = when deriving a property.
+ #
+-DLLS += vboxvideo_drv_70
+ vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ if1of ($(KBUILD_TARGET), linux)
+  vboxvideo_drv_70_CFLAGS += \
+@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
+ #
+ # vboxvideo_drv_71
+ #
+-DLLS += vboxvideo_drv_71
+ vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
+@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)
+ #
+ # vboxvideo_drv_13
+ #
+-DLLS += vboxvideo_drv_13
+ vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
+@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
+ #
+ # vboxvideo_drv_14
+ #
+-DLLS += vboxvideo_drv_14
+ vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
+@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_13_SOURCES)
+ #
+ # vboxvideo_drv_15
+ #
+-DLLS += vboxvideo_drv_15
+ vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
+@@ -192,7 +186,6 @@ endif
+ #
+ # vboxvideo_drv_16
+ #
+-DLLS += vboxvideo_drv_16
+ vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ #
+ # vboxvideo_drv_17
+ #
+-DLLS += vboxvideo_drv_17
+ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ #
+ # vboxvideo_drv_18
+ #
+-DLLS += vboxvideo_drv_18
+ vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ #
+ # vboxvideo_drv_19
+ #
+-DLLS += vboxvideo_drv_19
+ vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ #
+ # vboxvideo_drv_110
+ #
+-DLLS += vboxvideo_drv_110
+ vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
+ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ 
+ 
++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
++	/usr/include/xorg \
++	/usr/include/x11 \
++	/usr/include/pixman-1 \
++	/usr/include/X11/dri \
++	/usr/include/drm \
++	/usr/include/libdrm
++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++DLLS += vboxvideo_drv_$(XSERVER_VERSION)
++
++# required for lenny backports
++ifeq ($(XSERVER_VERSION),14)
++	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
++endif
++
++
+ # Check the undefined symbols in the X.Org modules against lists of allowed
+ # symbols.  Not very elegant, but it will catch problems early.
+ ifdef VBOX_WITH_TESTCASES
+
diff --git a/libre/virtualbox/60-vboxguest.rules b/libre/virtualbox/60-vboxguest.rules
new file mode 100644
index 000000000..d64575709
--- /dev/null
+++ b/libre/virtualbox/60-vboxguest.rules
@@ -0,0 +1,3 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
+
diff --git a/libre/virtualbox/LocalConfig.kmk b/libre/virtualbox/LocalConfig.kmk
new file mode 100644
index 000000000..97123a296
--- /dev/null
+++ b/libre/virtualbox/LocalConfig.kmk
@@ -0,0 +1,20 @@
+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_WITH_REGISTRATION_REQUEST =
+VBOX_WITH_UPDATE_REQUEST =
+VBOX_WITH_VNC := 1
+VBOX_BLD_PYTHON = python2
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
+
diff --git a/libre/virtualbox/PKGBUILD b/libre/virtualbox/PKGBUILD
new file mode 100644
index 000000000..bfd784c0d
--- /dev/null
+++ b/libre/virtualbox/PKGBUILD
@@ -0,0 +1,212 @@
+# $Id: PKGBUILD 56698 2011-10-10 18:23:45Z ibiru $
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Changes:
+# * Adapt to linux-libre
+# * virtualbox-{archlinux,parabola}-*
+# * Removed unfree user manual
+# * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules"
+# Based on 
+#Maintainer: Ionut Biru <ibiru@archlinux.org>
+pkgbase=virtualbox
+pkgname=('virtualbox' 'virtualbox-parabola-additions' 'virtualbox-parabola-modules' 'virtualbox-sdk')
+pkgver=4.1.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://virtualbox.org'
+license=('GPL' 'custom')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
+'xorg-server-devel' 'xf86driproto' 'libxcomposite' 'pkgconfig')
+[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
+source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
+        virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
+        10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
+        change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
+_kernver=3.0-LIBRE
+options=(!distcc)
+
+build() {
+    cd "$srcdir/VirtualBox-${pkgver}_OSE"
+
+    patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch"
+    patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
+    patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
+    patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+
+    cp "$srcdir/LocalConfig.kmk" .
+
+    ./configure --disable-docs \
+        --enable-webservice \
+        --enable-vde \
+        --with-linux=/usr/src/linux-${_kernver}
+    source ./env.sh
+    kmk all
+
+    export KERN_DIR=/usr/src/linux-${_kernver}
+    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo"
+    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
+}
+
+package_virtualbox() {
+    pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
+    depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make')
+    optdepends=('qt: for VirtualBox GUI'
+                'vde2: Virtual Distributed Ethernet support'
+                'virtualbox-sdk: developer kit')
+
+    replaces=('virtualbox-ose')
+    conflicts=('virtualbox-ose')
+    install=virtualbox.install
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+    mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
+
+    #Binaries and Wrapper with Launchers
+    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
+
+    for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
+        ln -sf VBox "$pkgdir/usr/bin/$i"
+    done
+    install -m 0755 VBoxTunctl "$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"
+
+    #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}_OSE/COPYING" \
+        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
+    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
+        "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
+
+    #sources for modules
+    cp -r src ${pkgdir}/usr/lib/virtualbox
+    #install compilation script
+    install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
+}
+
+package_virtualbox-sdk() {
+    pkgdesc=" VirtualBox Software Developer Kit (SDK)"
+    depends=('python2')
+
+    mkdir -p "$pkgdir/usr/lib/virtualbox"
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/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-parabola-additions(){
+    pkgdesc="Additions only for Parabola guests (userspace tools)"
+    depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
+    replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
+    conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
+    provides=("virtualbox-archlinux-additions=${pkgver}")
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/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}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+        "$pkgdir"/usr/bin/VBoxClient-all
+    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
+    install -D vboxvideo_drv_111.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/lib/security/pam_vbox.so"
+
+    # install rc.d script
+    install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service"
+
+    # install sample config
+    install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
+}
+
+package_virtualbox-parabola-modules(){
+    pkgdesc="Additions only for Parabola guests (kernel modules)"
+    license=('GPL')
+    install=virtualbox-parabola-modules.install
+    depends=('linux-libre>=3.0' 'linux-libre<3.1')
+    replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
+    conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
+    provides=("virtualbox-archlinux-modules=${pkgver}")
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+
+    install -D -m644 vboxguest.ko \
+        "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko"
+
+    install -D -m644 vboxsf.ko \
+        "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko"
+
+    install -D -m644 vboxvideo.ko \
+        "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko"
+
+    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
+        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
+
+    sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-parabola-modules.install"
+}
+
+md5sums=('dc6e6801b3823332b6ca2e9915221aae'
+         'a9f22ccaacb207e0e1c5450fede82d06'
+         'b7cbcf89a30c712fed4435dea28d1703'
+         'cee0c968c923760181ae060eab1c2e58'
+         '13ff08388a54fd48cc04523380f26af6'
+         '47349d711ecb5fbc105a18f9f936953b'
+         '0d91f80ce6a4985db8d2f8f65a61458e'
+         '47d6ee4f673bf31babbb7b4edb61e547'
+         '6df8eb5173c4f84faedb4962c4d5f0ef'
+         'b978dfdbff377e00ddecb24cb3218ed2'
+         '2460dedb8bdce85f9d7e075742e94d24')
diff --git a/libre/virtualbox/change_default_driver_dir.patch b/libre/virtualbox/change_default_driver_dir.patch
new file mode 100644
index 000000000..f6dc7e1a0
--- /dev/null
+++ b/libre/virtualbox/change_default_driver_dir.patch
@@ -0,0 +1,19 @@
+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/libre/virtualbox/vbox-service.conf b/libre/virtualbox/vbox-service.conf
new file mode 100644
index 000000000..31262af37
--- /dev/null
+++ b/libre/virtualbox/vbox-service.conf
@@ -0,0 +1,3 @@
+# VBoxService -h
+VBOX_SERVICE_OPTION=""
+
diff --git a/libre/virtualbox/vbox-service.rc b/libre/virtualbox/vbox-service.rc
new file mode 100644
index 000000000..381e3d751
--- /dev/null
+++ b/libre/virtualbox/vbox-service.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/vbox-service
+
+name=VBoxService
+PID=$(pidof -o %PPID $name)
+
+case "$1" in
+  start)
+    stat_busy "Starting $name service"
+    [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
+    && { add_daemon $name; stat_done; } \
+    || { stat_fail; exit 1; }
+    ;;
+  stop)
+    stat_busy "Stopping $name service"
+    [[ -n "$PID" ]] && kill $PID &>/dev/null \
+    && { rm_daemon $name; stat_done; } \
+    || { stat_fail; exit 1; }
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  status)
+    stat_busy "Checking $name status";
+    ck_status $name
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart|status}"
+    exit 1
+esac
+
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
+
diff --git a/libre/virtualbox/vboxbuild b/libre/virtualbox/vboxbuild
new file mode 100644
index 000000000..66f5812ab
--- /dev/null
+++ b/libre/virtualbox/vboxbuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/vbox/vbox.cfg
+
+MODLIST=()
+LOG="/var/log/vbox-install.log"
+>| "$LOG"
+
+if [[ $INSTALL_DIR ]]; then
+  VBOXMANAGE=$INSTALL_DIR/VBoxManage
+  BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
+  BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp
+  BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp
+  BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp
+else
+  echo "error: missing vbox.cfg"
+  exit 1
+fi
+
+if [[ -f /proc/modules ]]; then
+  IFS=$'\n' read -r -d '' -a MODLIST < \
+    <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules)
+fi
+
+if (( ${#MODLIST[*]} )); then
+  stat_busy "Unloading VirtualBox kernel modules"
+  modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
+fi
+
+for kdir in /lib/modules/*; do
+  if [[ ! -d $kdir/kernel ]]; then
+    # found a stale kernel
+    mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
+    if (( ${#mods[@]} )); then
+      stat_busy "Removing all old VirtualBox kernel modules"
+      if rm -f "${mods[@]}" &&
+          rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then
+        stat_done
+      else
+        stat_fail
+      fi
+    fi
+  fi
+done
+
+# default to the currently running kernel
+if (( ! $# )); then
+  set -- $(uname -r)
+fi
+
+for kernver; do
+  export KERN_DIR=/lib/modules/$kernver/build
+  if [[ ! -d $KERN_DIR ]]; then
+    printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
+        "$KERN_DIR"
+    continue
+  fi
+
+  stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
+    for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
+      if ! ${!build} \
+        --save-module-symvers /tmp/vboxdrv-Module.symvers \
+        --no-print-directory install >> $LOG 2>&1; then
+        echo  "Look at $LOG to find out what went wrong"
+        stat_fail
+        continue
+      fi
+    done
+  stat_done
+done
+
+if (( ${#MODLIST[*]} )); then
+  stat_busy "Reloading VirtualBox kernel modules"
+  modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
+fi
+
+
diff --git a/libre/virtualbox/vboxdrv-reference.patch b/libre/virtualbox/vboxdrv-reference.patch
new file mode 100644
index 000000000..14e26d114
--- /dev/null
+++ b/libre/virtualbox/vboxdrv-reference.patch
@@ -0,0 +1,46 @@
+diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 15:11:37.730121727 +0000
++++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 19:02:15.658471139 +0000
+@@ -75,9 +75,8 @@
+   "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. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
+-  "package first. This package keeps track of Linux kernel changes and "
++  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
++  "as root. This package keeps track of Linux kernel changes and"
+   "recompiles the vboxdrv kernel module if necessary."
+   );
+ 
+@@ -92,7 +91,7 @@
+   "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/>"
++  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
+   "may correct this. Make sure that you do not mix the "
+   "OSE version and the PUEL version of VirtualBox."
+   );
+diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-07-19 15:11:37.603453927 +0000
++++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh	2011-07-19 19:02:15.658471139 +0000
+@@ -34,7 +34,7 @@
+          available for the current kernel (`uname -r`) or it failed to
+          load. Please recompile the kernel module and install it by
+ 
+-           sudo /etc/init.d/vboxdrv setup
++           sudo /usr/bin/vboxbuild
+ 
+          You will not be able to start VMs until this problem is fixed.
+ EOF
+@@ -42,7 +42,7 @@
+     cat << EOF
+ WARNING: The character device /dev/vboxdrv does not exist. Try
+ 
+-           sudo /etc/init.d/vboxdrv restart
++           sudo /usr/bin/vboxbuild
+ 
+          and if that is not successful, try to re-install the package.
+ 
+
diff --git a/libre/virtualbox/virtualbox-4-makeself-check.patch b/libre/virtualbox/virtualbox-4-makeself-check.patch
new file mode 100644
index 000000000..57862b41e
--- /dev/null
+++ b/libre/virtualbox/virtualbox-4-makeself-check.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-4.0.0_OSE/configure
++++ VirtualBox-4.0.0_OSE/configure
+@@ -2527,7 +2527,6 @@
+   check_compiler_h
+   [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+   # tools/common/makeself*
+-  [ $OSE -ge 1 ] && check_makeself
+ fi
+ 
+ [ -n "$SETUP_WINE" ] && setup_wine
+
diff --git a/libre/virtualbox/virtualbox-4-mkisofs-check.patch b/libre/virtualbox/virtualbox-4-mkisofs-check.patch
new file mode 100644
index 000000000..d43962148
--- /dev/null
+++ b/libre/virtualbox/virtualbox-4-mkisofs-check.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-4.0.0_OSE/configure
++++ VirtualBox-4.0.0_OSE/configure
+@@ -2499,7 +2499,6 @@
+ # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
+ # [ "$OS" != "darwin" ] && check_yasm
+ [ "$OS" != "darwin"  ] && check_xsltproc
+-[ "$OS" != "darwin"  ] && check_mkisofs
+ 
+ # the libraries
+ [ "$OS" != "darwin"  ] && check_pthread
+
diff --git a/libre/virtualbox/virtualbox-parabola-modules.install b/libre/virtualbox/virtualbox-parabola-modules.install
new file mode 100644
index 000000000..75d28784a
--- /dev/null
+++ b/libre/virtualbox/virtualbox-parabola-modules.install
@@ -0,0 +1,25 @@
+KERNEL_VERSION='3.0-LIBRE'
+
+post_install() {
+  cat << EOM
+
+===> virtualbox-parabola-modules post-install message:
+===>
+===> You may want to load vboxguest, vboxsf and vboxvideo
+===>
+===> To load them automatically, add them
+===> to the MODULES array in /etc/rc.conf.
+
+EOM
+
+  depmod -v $KERNEL_VERSION >/dev/null 2>&1
+}
+
+post_remove() {
+  depmod -v $KERNEL_VERSION >/dev/null 2>&1
+}
+
+post_upgrade() {
+  depmod -v $KERNEL_VERSION >/dev/null 2>&1
+}
+
diff --git a/libre/virtualbox/virtualbox.install b/libre/virtualbox/virtualbox.install
new file mode 100644
index 000000000..238b0561f
--- /dev/null
+++ b/libre/virtualbox/virtualbox.install
@@ -0,0 +1,52 @@
+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
+}
+
+post_install() {
+    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
+    /bin/cat << EOF
+
+===> In order to run VirtualBox, you have to  be in the 'vboxusers' group.
+===>
+===> If you want to be able to install guest additions, you have to install
+===> 'virtualbox-additions' package.
+===>
+===> You must load vboxdrv module before starting VirtualBox:
+===> # modprobe vboxdrv
+===>
+===> For networking you must load vboxnetflt or vboxnetadp.
+===>
+===> For PCI passthrough support load vboxpci module.
+===>
+===> To load it automatically, add vboxdrv module
+===> to the MODULES array in /etc/rc.conf.
+
+*** To compile the modules do /usr/bin/vboxbuild ***
+
+EOF
+  utils
+}
+
+post_upgrade() {
+    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
+    /bin/cat << EOF
+*** To recompile the modules do /usr/bin/vboxbuild ***
+EOF
+   utils
+}
+
+post_remove() {
+    groupdel vboxusers >/dev/null 2>&1 || true
+    utils
+}
+
diff --git a/testing/aisleriot/PKGBUILD b/testing/aisleriot/PKGBUILD
new file mode 100644
index 000000000..e52e2410f
--- /dev/null
+++ b/testing/aisleriot/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 140600 2011-10-17 12:27:47Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=aisleriot
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="GNOME Solitaire card games"
+arch=(i686 x86_64)
+license=(GPL)
+url="http://www.gnome.org"
+groups=('gnome-extra')
+depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf)
+makedepends=(gnome-doc-utils intltool itstool)
+options=('!emptydirs' '!libtool')
+install=aisleriot.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-static
+  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 aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/testing/aisleriot/aisleriot.install b/testing/aisleriot/aisleriot.install
new file mode 100644
index 000000000..713506dba
--- /dev/null
+++ b/testing/aisleriot/aisleriot.install
@@ -0,0 +1,22 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  usr/sbin/gconfpkg --install aisleriot
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall aisleriot
+}
+
+post_remove() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+}
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
new file mode 100644
index 000000000..f64daa4e7
--- /dev/null
+++ b/testing/clutter/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 140607 2011-10-17 12:48:01Z heftig $
+# 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.8.2
+pkgrel=1
+pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
+arch=('i686' 'x86_64')
+url="http://clutter-project.org/"
+options=('!libtool')
+license=('LGPL')
+depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi')
+makedepends=('gobject-introspection' 'mesa')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-introspection
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD
new file mode 100644
index 000000000..4fdf7ebe5
--- /dev/null
+++ b/testing/cogl/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 140619 2011-10-17 14:45:25Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=cogl
+pkgver=1.8.2
+pkgrel=1
+pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
+arch=('i686' 'x86_64')
+url="http://www.clutter-project.org/"
+license=('GPL2')
+depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
+makedepends=('mesa' 'gobject-introspection')
+options=(!libtool)
+source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz)
+sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
new file mode 100644
index 000000000..de63b7027
--- /dev/null
+++ b/testing/empathy/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 140627 2011-10-17 15:19:40Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=empathy
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="A GNOME instant messaging client using the Telepathy framework."
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/Empathy"
+license=('GPL2')
+depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring'
+'libcanberra' 'iso-codes' 'networkmanager')
+makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto')
+optdepends=('telepathy-gabble: XMPP/Jabber support'
+            'telepathy-butterfly: MSN support'
+            'telepathy-idle: IRC support'
+            'telepathy-salut: Link-local XMPP support'
+            'telepathy-sofiasip: SIP support'
+            'telepathy-haze: libpurple support')
+options=('!libtool')
+groups=('gnome-extra')
+install=empathy.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d50e9b0e31df0e8d137c120c61c5aeaaad06fb24bb208d105b186a01b3f1de0a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --sysconfdir=/etc  \
+      --libexecdir=/usr/lib/empathy \
+      --disable-static \
+      --disable-scrollkeeper \
+      --disable-schemas-compile
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
new file mode 100644
index 000000000..c3f7abf13
--- /dev/null
+++ b/testing/empathy/empathy.install
@@ -0,0 +1,18 @@
+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
+    echo "To use Empathy you need to install at least one Telepathy connection manager."
+}
+
+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_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
+}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
new file mode 100644
index 000000000..cd2a3c121
--- /dev/null
+++ b/testing/evince/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 140637 2011-10-17 16:54:07Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=evince
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="Simply a document viewer"
+url="http://projects.gnome.org/evince/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
+makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
+optdepends=('texlive-bin: DVI support')
+groups=('gnome-extra')
+install=evince.install
+options=('!libtool' '!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr   --sysconfdir=/etc \
+      --localstatedir=/var    --libexecdir=/usr/lib/evince \
+      --disable-static        --enable-nautilus \
+      --enable-pdf            --enable-tiff \
+      --enable-djvu           --enable-dvi \
+      --enable-t1lib          --enable-comics \
+      --disable-scrollkeeper  --disable-schemas-compile \
+      --enable-introspection
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
new file mode 100644
index 000000000..9643a9ba0
--- /dev/null
+++ b/testing/evince/evince.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.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall evince
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
new file mode 100644
index 000000000..a76c1e73c
--- /dev/null
+++ b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
@@ -0,0 +1,11 @@
+# Get access to /dev/rfkill for users
+# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
+#
+# Updated for udev >= 154
+# http://bugs.debian.org/582188
+# https://bugzilla.redhat.com/show_bug.cgi?id=588660
+
+ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
+ACTION!="add|change", GOTO="gnome_bluetooth_end"
+KERNEL=="rfkill", TAG+="udev-acl"
+LABEL="gnome_bluetooth_end"
diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD
new file mode 100644
index 000000000..1a76041ff
--- /dev/null
+++ b/testing/gnome-bluetooth/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 140617 2011-10-17 13:37:28Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+
+pkgname=gnome-bluetooth
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="The GNOME Bluetooth Subsystem"
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/GnomeBluetooth"
+license=('GPL' 'LGPL')
+depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+install=gnome-bluetooth.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        61-gnome-bluetooth-rfkill.rules)
+sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0'
+            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-desktop-update \
+    --disable-icon-update \
+    --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \
+                     "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
+  install -d ${pkgdir}/etc/ld.so.conf.d
+  echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+}
diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install
new file mode 100644
index 000000000..927142ee0
--- /dev/null
+++ b/testing/gnome-bluetooth/gnome-bluetooth.install
@@ -0,0 +1,12 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD
new file mode 100644
index 000000000..d8d97e614
--- /dev/null
+++ b/testing/gnome-color-manager/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 140598 2011-10-17 12:23:54Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=gnome-color-manager
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="Color profile manager for the GNOME desktop"
+arch=(i686 x86_64)
+url="http://projects.gnome.org/gnome-color-manager/"
+license=(GPL2)
+depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash')
+makedepends=('intltool' 'gtk-doc')
+install=gnome-color-manager.install
+options=('!libtool' '!emptydirs')
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436')
+
+build(){
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # man pages need docbook-sgml, which we don't have
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-color-manager \
+      --disable-static --disable-man-pages
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install
new file mode 100644
index 000000000..04fda0ddc
--- /dev/null
+++ b/testing/gnome-color-manager/gnome-color-manager.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.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-color-manager
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
new file mode 100644
index 000000000..dba6b22ef
--- /dev/null
+++ b/testing/gnome-control-center/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 140631 2011-10-17 15:32:06Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="The Control Center for GNOME"
+arch=('i686' 'x86_64')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+            'apg: adds password generation for user accounts'
+            'gnome-color-manager: for color management tasks')
+makedepends=('gnome-doc-utils' 'intltool')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --disable-scrollkeeper --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 "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install
new file mode 100644
index 000000000..eb703319f
--- /dev/null
+++ b/testing/gnome-control-center/gnome-control-center.install
@@ -0,0 +1,19 @@
+pkgname=gnome-control-center
+
+post_install() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD
new file mode 100644
index 000000000..c7abe7b61
--- /dev/null
+++ b/testing/gnome-documents/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 140635 2011-10-17 15:38:21Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=gnome-documents
+pkgver=0.2.1
+pkgrel=1
+pkgdesc="Documents Manager for GNOME"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL')
+groups=('gnome-extra')
+depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker')
+makedepends=('intltool' 'vala')
+optdepends=('unoconv: Support for Libreoffice document types')
+options=('!libtool')
+install=gnome-documents.install
+source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/gnome-documents
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-documents/gnome-documents.install b/testing/gnome-documents/gnome-documents.install
new file mode 100644
index 000000000..95114273e
--- /dev/null
+++ b/testing/gnome-documents/gnome-documents.install
@@ -0,0 +1,13 @@
+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
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD
new file mode 100644
index 000000000..59690613a
--- /dev/null
+++ b/testing/gnome-online-accounts/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 140651 2011-10-17 18:33:53Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gnome-online-accounts
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="GNOME service to access online accounts"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL')
+depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme')
+makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
+options=(!libtool)
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-online-accounts/gnome-online-accounts.install b/testing/gnome-online-accounts/gnome-online-accounts.install
new file mode 100644
index 000000000..2e02b7952
--- /dev/null
+++ b/testing/gnome-online-accounts/gnome-online-accounts.install
@@ -0,0 +1,11 @@
+post_install () {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
new file mode 100644
index 000000000..0fa540c65
--- /dev/null
+++ b/testing/gnome-power-manager/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 140596 2011-10-17 12:20:23Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-power-manager
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="Power management tools."
+arch=(i686 x86_64)
+url="http://www.gnome.org/projects/gnome-power-manager/"
+license=('GPL')
+depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils')
+options=(!emptydirs)
+install=gnome-power-manager.install
+groups=(gnome-extra)
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-power-manager \
+      --disable-scrollkeeper \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install
new file mode 100644
index 000000000..4666938db
--- /dev/null
+++ b/testing/gnome-power-manager/gnome-power-manager.install
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.91.92) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-power-manager
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..0e268879e
--- /dev/null
+++ b/testing/gnome-settings-daemon/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 140621 2011-10-17 14:55:58Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-settings-daemon
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="The GNOME Settings daemon"
+arch=('i686' 'x86_64')
+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')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+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=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
+      --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install
new file mode 100644
index 000000000..483fb9450
--- /dev/null
+++ b/testing/gnome-settings-daemon/gnome-settings-daemon.install
@@ -0,0 +1,18 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD
new file mode 100644
index 000000000..185140261
--- /dev/null
+++ b/testing/gnome-terminal/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 140609 2011-10-17 12:53:24Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-terminal
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="The GNOME Terminal Emulator"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
+makedepends=('gnome-doc-utils' 'intltool' 'gtk2')
+options=('!emptydirs')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-terminal.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make 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 gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install
new file mode 100644
index 000000000..04c2b3c2c
--- /dev/null
+++ b/testing/gnome-terminal/gnome-terminal.install
@@ -0,0 +1,17 @@
+pkgname=gnome-terminal
+
+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/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD
new file mode 100644
index 000000000..6467f24c9
--- /dev/null
+++ b/testing/gnome-user-share/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 140629 2011-10-17 15:25:55Z ibiru $
+# Maintainer: Roman Kyrylych <roman@archlinux.org>
+
+pkgname=gnome-user-share
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="Easy to use user-level file sharing for GNOME."
+arch=('i686' 'x86_64')
+url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
+license=('GPL')
+depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3')
+makedepends=('intltool' 'gnome-doc-utils' 'nautilus')
+options=('!emptydirs' '!libtool')
+install=gnome-user-share.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/gnome-user-share \
+      --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make 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 gnome-user-share ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install
new file mode 100644
index 000000000..3cc1b5286
--- /dev/null
+++ b/testing/gnome-user-share/gnome-user-share.install
@@ -0,0 +1,22 @@
+pkgname=gnome-user-share
+
+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() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/gnome-utils/PKGBUILD b/testing/gnome-utils/PKGBUILD
new file mode 100644
index 000000000..c9b7d60e9
--- /dev/null
+++ b/testing/gnome-utils/PKGBUILD
@@ -0,0 +1,41 @@
+#  $Id: PKGBUILD 140623 2011-10-17 15:11:03Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-utils
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
+makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
+options=('!libtool' '!emptydirs')
+url="http://www.gnome.org"
+groups=('gnome-extra')
+install=gnome-utils.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --prefix=/usr --sysconfdir=/etc \
+        --libexecdir=/usr/lib/gnome-utils \
+        --localstatedir=/var --disable-static \
+        --disable-scrollkeeper \
+        --disable-schemas-compile \
+        --disable-schemas-install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
+  # remove it also from Xfce menu that ships its own thingy
+  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop
+  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop
+}
diff --git a/testing/gnome-utils/gnome-utils.install b/testing/gnome-utils/gnome-utils.install
new file mode 100644
index 000000000..a04bda405
--- /dev/null
+++ b/testing/gnome-utils/gnome-utils.install
@@ -0,0 +1,26 @@
+pkgname=gnome-utils
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
new file mode 100644
index 000000000..2c2b77bc7
--- /dev/null
+++ b/testing/gucharmap/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 140613 2011-10-17 13:17:00Z heftig $
+# Maintainer: Jan De Groot <jgc@archlinux.org>
+
+pkgname=gucharmap
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="Gnome Unicode Charmap"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org"
+depends=('gconf' 'hicolor-icon-theme')
+makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+install=gucharmap.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --disable-scrollkeeper  --enable-introspection
+  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 gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
new file mode 100644
index 000000000..4de3253f6
--- /dev/null
+++ b/testing/gucharmap/gucharmap.install
@@ -0,0 +1,22 @@
+pkgname=gucharmap
+
+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() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
new file mode 100644
index 000000000..a378f78d0
--- /dev/null
+++ b/testing/gvfs/PKGBUILD
@@ -0,0 +1,113 @@
+# $Id: PKGBUILD 140615 2011-10-17 13:34:14Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
+pkgver=1.10.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
+url="http://www.gnome.org"
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/etc/bash_completion.d
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support')
+  install=gvfs.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  sed -e 's/^am__append_3/#am__append_3/' \
+      -e 's/^am__append_4/#am__append_4/' \
+      -i monitor/Makefile
+  make DESTDIR="${pkgdir}" install
+
+  cd "${pkgdir}"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
+  install=gvfs-smb.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -m755 -d "${pkgdir}/usr/lib/gvfs"
+  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=${pkgver}")
+  install=gvfs-module.install
+  install -m755 -d "${pkgdir}/usr/lib/gvfs"
+  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
+
+}
diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
new file mode 100644
index 000000000..09d1f11ec
--- /dev/null
+++ b/testing/gvfs/gvfs-module.install
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
new file mode 100644
index 000000000..0b8783c7b
--- /dev/null
+++ b/testing/gvfs/gvfs-smb.install
@@ -0,0 +1,12 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
new file mode 100644
index 000000000..9458b1513
--- /dev/null
+++ b/testing/gvfs/gvfs.install
@@ -0,0 +1,14 @@
+post_install() {
+  usr/bin/gio-querymodules usr/lib/gio/modules
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  usr/bin/gio-querymodules usr/lib/gio/modules
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD
new file mode 100644
index 000000000..707fb70fa
--- /dev/null
+++ b/testing/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.2.1
+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=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734')
+
+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/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install
new file mode 100644
index 000000000..1ae919322
--- /dev/null
+++ b/testing/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/testing/notification-daemon/PKGBUILD b/testing/notification-daemon/PKGBUILD
new file mode 100644
index 000000000..9421f4d27
--- /dev/null
+++ b/testing/notification-daemon/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 140649 2011-10-17 18:08:51Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Mark Rosenstand <mark@borkware.net>
+
+pkgname=notification-daemon
+pkgver=0.7.3
+pkgrel=1
+pkgdesc="Notification daemon for the desktop notifications framework"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.galago-project.org/specs/notification/"
+depends=('gtk3' 'libcanberra')
+groups=('gnome')
+makedepends=('pkgconfig' 'intltool')
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --prefix=/usr --sysconfdir=/etc \
+        --libexecdir=/usr/lib/notification-daemon-1.0 \
+        --localstatedir=/var --disable-static
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR=${pkgdir} install
+}
diff --git a/testing/notification-daemon/notification-daemon.install b/testing/notification-daemon/notification-daemon.install
new file mode 100644
index 000000000..8a1aa3433
--- /dev/null
+++ b/testing/notification-daemon/notification-daemon.install
@@ -0,0 +1,22 @@
+pkgname=notification-daemon
+
+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() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
new file mode 100644
index 000000000..1b4bc3612
--- /dev/null
+++ b/testing/openssh/PKGBUILD
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 140605 2011-10-17 12:35:05Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=openssh
+pkgver=5.9p1
+pkgrel=4
+pkgdesc='Free version of the SSH connectivity tools'
+arch=('i686' 'x86_64')
+license=('custom:BSD')
+url='http://www.openssh.org/portable.html'
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+depends=('krb5' 'openssl' 'libedit')
+optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
+        'sshd.confd'
+        'sshd.pam'
+        'sshd')
+sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
+          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+          '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1'
+          '21fa88de6cc1c7912e71655f50896ba17991a1c2')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/ssh \
+		--sysconfdir=/etc/ssh \
+		--with-privsep-user=nobody \
+		--with-md5-passwords \
+		--with-pam \
+		--with-mantype=man \
+		--with-xauth=/usr/bin/xauth \
+		--with-kerberos5=/usr \
+		--with-ssl-engine \
+		--with-libedit=/usr/lib \
+		--disable-strip # stripping is done by makepkg
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
+	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
+	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+
+	rm "${pkgdir}"/usr/share/man/man1/slogin.1
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+
+	# additional contrib scripts that we like
+	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
+	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
+	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+
+	# PAM is a common, standard feature to have
+	sed \
+		-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
+		-e '/^#UsePAM no$/c UsePAM yes' \
+		-i "${pkgdir}"/etc/ssh/sshd_config
+}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
new file mode 100755
index 000000000..1d68fb877
--- /dev/null
+++ b/testing/openssh/sshd
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/run/sshd.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
+	PID=
+	rm $PIDFILE 2>/dev/null
+fi
+
+case "$1" in
+	start)
+		stat_busy 'Starting Secure Shell Daemon'
+		/usr/bin/ssh-keygen -A
+		[[ -d /var/empty ]] || mkdir -p /var/empty
+		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
+		if [[ $? -gt 0 ]]; then
+			stat_fail
+		else
+			add_daemon sshd
+			stat_done
+		fi
+		;;
+	stop)
+		stat_busy 'Stopping Secure Shell Daemon'
+		[[ ! -z $PID ]] && kill $PID &> /dev/null
+		if [[ $? -gt 0 ]]; then
+			stat_fail
+		else
+			rm_daemon sshd
+			stat_done
+		fi
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
new file mode 100644
index 000000000..5ce7c0079
--- /dev/null
+++ b/testing/openssh/sshd.confd
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to sshd
+#
+SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
new file mode 100644
index 000000000..ff8829fe9
--- /dev/null
+++ b/testing/openssh/sshd.pam
@@ -0,0 +1,11 @@
+#%PAM-1.0
+#auth		required	pam_securetty.so	#Disable remote root
+auth		required	pam_unix.so
+auth		required	pam_env.so
+account		required	pam_nologin.so
+account		required	pam_unix.so
+account		required	pam_time.so
+password	required	pam_unix.so
+session		required	pam_unix_session.so
+session		required	pam_limits.so
+-session	optional	pam_ck_connector.so nox11
diff --git a/testing/polkit-gnome/PKGBUILD b/testing/polkit-gnome/PKGBUILD
new file mode 100644
index 000000000..00e0132e5
--- /dev/null
+++ b/testing/polkit-gnome/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 140661 2011-10-17 19:27:15Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: onestep_ua <onestep@ukr.net>
+
+pkgname=polkit-gnome
+pkgver=0.104
+pkgrel=1
+pkgdesc="PolicyKit integration for the GNOME desktop"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/PolicyKit"
+license=('LGPL')
+depends=('polkit' 'gtk3')
+makedepends=('intltool' 'gobject-introspection')
+options=(!libtool)
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
+        polkit-gnome-authentication-agent-1.desktop)
+sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94'
+            'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \
+      --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \
+      "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop"
+}
diff --git a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
new file mode 100644
index 000000000..fc2acc28d
--- /dev/null
+++ b/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Name[ar]=مدير الاستيثاق PolicyKit
+Name[be]=PolicyKit - аґент аўтэнтыфікацыі
+Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Name[ca]=Agent d'autenticació del PolicyKit
+Name[cs]=Ověřovací agent PolicyKit
+Name[da]=Godkendelsesprogrammet PolicyKit
+Name[de]=Legitimationsdienst von PolicyKit
+Name[el]=Πράκτορας πιστοποίησης PolicyKit
+Name[en_GB]=PolicyKit Authentication Agent
+Name[es]=Agente de autenticación de PolicyKit
+Name[eu]=PolicyKit autentifikatzeko agentea
+Name[fi]=PolicytKit-tunnistautumisohjelma
+Name[fr]=Agent d'authentification de PolicyKit
+Name[gl]=Axente de autenticación PolicyKit
+Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Name[hu]=PolicyKit hitelesítési ügynök
+Name[it]=Agente di autenticazione per PolicyKit
+Name[ja]=PolicyKit 認証エージェント
+Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Name[lt]=PolicyKit tapatybės nustatymo agentas
+Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Name[pl]=Agent uwierzytelniania PolicyKit
+Name[pt]=Agente de Autenticação PolicyKit
+Name[pt_BR]=Agente de autenticação PolicyKit
+Name[ro]=Agent de autentificare PolicyKit
+Name[sk]=Agent PolicyKit na overovanie totožnosti
+Name[sl]=PolicyKit program overjanja
+Name[sv]=Autentiseringsagent för PolicyKit
+Name[ta]=PolicyKit அங்கீகார முகவர்
+Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Name[uk]=Агент автентифікації PolicyKit
+Name[zh_CN]=PolicyKit 认证代理
+Name[zh_HK]=PolicyKit 驗證代理程式
+Name[zh_TW]=PolicyKit 驗證代理程式
+Comment=PolicyKit Authentication Agent
+Comment[ar]=مدير الاستيثاق PolicyKit
+Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
+Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Comment[ca]=Agent d'autenticació del PolicyKit
+Comment[cs]=Ověřovací agent PolicyKit
+Comment[da]=Godkendelsesprogrammet PolicyKit
+Comment[de]=Legitimationsdienst von PolicyKit
+Comment[el]=Πράκτορας πιστοποίησης PolicyKit
+Comment[en_GB]=PolicyKit Authentication Agent
+Comment[es]=Agente de autenticación de PolicyKit
+Comment[eu]=PolicyKit autentifikatzeko agentea
+Comment[fi]=PolicytKit-tunnistautumisohjelma
+Comment[fr]=Agent d'authentification de PolicyKit
+Comment[gl]=Axente de autenticación PolicyKit
+Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Comment[hu]=PolicyKit hitelesítési ügynök
+Comment[it]=Agente di autenticazione per PolicyKit
+Comment[ja]=PolicyKit 認証エージェント
+Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Comment[lt]=PolicyKit tapatybės nustatymo agentas
+Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Comment[pl]=Agent uwierzytelniania PolicyKit
+Comment[pt]=Agente de Autenticação PolicyKit
+Comment[pt_BR]=Agente de autenticação PolicyKit
+Comment[ro]=Agent de autentificare PolicyKit
+Comment[sk]=Agent PolicyKit na overovanie totožnosti
+Comment[sl]=PolicyKit program overjanja
+Comment[sv]=Autentiseringsagent för PolicyKit
+Comment[ta]=PolicyKit அங்கீகார முகவர்
+Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Comment[uk]=Агент автентифікації PolicyKit
+Comment[zh_CN]=PolicyKit 认证代理
+Comment[zh_HK]=PolicyKit 驗證代理程式
+Comment[zh_TW]=PolicyKit 驗證代理程式
+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+NotShowIn=KDE;
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD
new file mode 100644
index 000000000..e33cf34e2
--- /dev/null
+++ b/testing/sushi/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 140633 2011-10-17 15:35:16Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=sushi
+pkgver=0.2.1
+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.2/$pkgname-$pkgver.tar.xz)
+sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1')
+
+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/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
new file mode 100644
index 000000000..efeeb6fa0
--- /dev/null
+++ b/testing/totem/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 140611 2011-10-17 13:04:37Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=totem
+pkgname=('totem' 'totem-plugin')
+pkgver=3.2.1
+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-gobject' '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=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4')
+
+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-plugins: Browse sidebar (remote media)'
+              'pyxdg: opensubtitles 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 plugin for web browsers"
+  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/testing/totem/totem.install b/testing/totem/totem.install
new file mode 100644
index 000000000..07cb42dcb
--- /dev/null
+++ b/testing/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/testing/vte3/PKGBUILD b/testing/vte3/PKGBUILD
new file mode 100644
index 000000000..01dbce661
--- /dev/null
+++ b/testing/vte3/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 140602 2011-10-17 12:30:38Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgbase=vte3
+pkgname=(vte3 vte-common)
+pkgver=0.30.1
+pkgrel=1
+pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
+arch=('i686' 'x86_64')
+license=('LGPL')
+options=('!libtool' '!emptydirs')
+makedepends=('intltool' 'gobject-introspection' 'gtk3')
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz)
+sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64')
+
+build() {
+  cd "${srcdir}/vte-${pkgver}"
+  #warning: type-punning to incomplete type might break strict-aliasing rules
+  export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/vte \
+      --localstatedir=/var --disable-static \
+      --enable-introspection
+  make
+}
+
+package_vte3(){
+  depends=('gtk3' 'vte-common')
+  cd "${srcdir}/vte-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
+}
+
+package_vte-common() {
+  pkgdesc="Common files used by vte and vte3"
+  cd "${srcdir}/vte-${pkgver}"
+
+  make -C gnome-pty-helper DESTDIR="${pkgdir}" install
+}
diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD
new file mode 100644
index 000000000..e916282d7
--- /dev/null
+++ b/testing/yelp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 140645 2011-10-17 18:01:35Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=yelp
+pkgver=3.2.1
+pkgrel=1
+pkgdesc="A help browser for GNOME"
+arch=('i686' 'x86_64')
+depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf')
+makedepends=('intltool' 'gtk-doc')
+groups=('gnome')
+license=('GPL')
+options=('!emptydirs' '!libtool')
+url="http://www.gnome.org"
+install=yelp.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d')
+
+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/testing/yelp/yelp.install b/testing/yelp/yelp.install
new file mode 100644
index 000000000..f3bf19a93
--- /dev/null
+++ b/testing/yelp/yelp.install
@@ -0,0 +1,19 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall yelp
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/~fauno/ruby-mustache/PKGBUILD b/~fauno/ruby-mustache/PKGBUILD
new file mode 100644
index 000000000..7b396434c
--- /dev/null
+++ b/~fauno/ruby-mustache/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: David Campbell <davekong@archlinux.us>
+pkgname=ruby-mustache
+pkgver=0.99.4
+pkgrel=1
+pkgdesc="A framework-agnostic way to render logic-free views."
+arch=('any')
+url="http://github.com/defunkt/mustache"
+license=(MIT)
+depends=('ruby')
+makedepends=('rubygems')
+source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
+noextract=("mustache-${pkgver}.gem")
+
+build() {
+  cd $srcdir
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --ignore-dependencies -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
+  -n "$pkgdir/usr/bin"
+
+  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/LICENSE \
+                 $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.1 \
+                 $pkgdir/usr/share/man/man1/mustache.1
+  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.5 \
+                 $pkgdir/usr/share/man/man5/mustache.5
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('650194ec2c166feb087377647414b9dc')
diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/~fauno/transmission-remote-cli/PKGBUILD
index 9a93c431f..869a2ebff 100644
--- a/~fauno/transmission-remote-cli/PKGBUILD
+++ b/~fauno/transmission-remote-cli/PKGBUILD
@@ -1,20 +1,21 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 pkgname=transmission-remote-cli
-pkgver=20110901
-pkgrel=2
+pkgver=0.10.4
+pkgrel=1
 pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission"
 arch=('any')
 url="http://github.com/fagga/transmission-remote-cli"
 license=('GPL3')
 depends=('python2')
-optdepends=('adns-python: Resolve IPs to host names'
+optdepends=('transmission-daemon>=2.40: for local transmission management'
+            'adns-python: Resolve IPs to host names'
             'python-geoip: Guess which country peers come from')
 makedepends=('git')
 conflicts=('transmission-remote-cli-git')
 replaces=('transmission-remote-cli-git')
 source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz
         python2.patch)
-md5sums=('1a087e384b413577f9d49917fd8eaab5'
+md5sums=('df3cdde879275fbffb1af17872e9c860'
          '6273609fb3a7294328aeaa526b76411c')
 
 _gitroot="http://github.com/fagga/transmission-remote-cli.git"
@@ -24,28 +25,29 @@ mksource() {
     echo "Connecting to the GIT repository..."
 
     if [ -d "$_gitname" ] ; then
-        pushd $_gitname && git pull origin
+        pushd $_gitname
+        git -b 2.40 origin/2.40
+        git pull origin
         echo "The local files are updated."
         popd
     else
         git clone $_gitroot
+        cd $_gitroot
+        git checkout -b 2.40 origin/2.40
     fi
 
     echo "GIT checkout done or server timeout"
 
-    tar czf ${pkgname}-$(date +%Y%m%d).tar.gz ${_gitname}/
+    git archive --prefix=${pkgname}-${pkgver}/ | gzip > ${pkgname}-${pkgver}.tar.gz
 }
 
 build() {
-    cd "${srcdir}/${_gitname}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     msg "Starting make..."
 
     patch -Np1 -i ${srcdir}/python2.patch
 
-	install -d $pkgdir/usr/bin/
-	install -D transmission-remote-cli.py $pkgdir/usr/bin/transmission-remote-cli
+	install -d ${pkgdir}/usr/bin/
+	install -D transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli
 
 }
-
-md5sums=('df3cdde879275fbffb1af17872e9c860'
-         '6273609fb3a7294328aeaa526b76411c')
author	root <root@rshg054.dnsready.net>	2011-10-18 23:14:49 +0000
committer	root <root@rshg054.dnsready.net>	2011-10-18 23:14:49 +0000
commit	791dde5091677cd6370690f9df9fb7cbdcfe0968 (patch)
tree	44b8403e7782995a56c22f0fdacd13b227667bb1
parent	c4f201fd7208805c7ee00e0ee833d3cc505898ac (diff)