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

Conflicts:
	community/zathura/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/libdvdread/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/postgresql/PKGBUILD

68 files changed, 1927 insertions, 242 deletions

diff --git a/community/courier-authlib/PKGBUILD b/community/courier-authlib/PKGBUILD
index 01dc6556c..b4389d8a1 100644
--- a/community/courier-authlib/PKGBUILD
+++ b/community/courier-authlib/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=courier-authlib
 pkgver=0.63.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Authentification library for the courier mailserver(s)"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
@@ -60,4 +60,9 @@ package() {
   chown -R 72:72 ${pkgdir}/var/spool/courier
   # docs say we can remove .a files after make
   find ${pkgdir} -name '*\.a' -exec rm -f {} \;
+  # Make libs available to /usr/lib
+  cd $pkgdir/usr/lib
+  for lib in courier-authlib/*.so; do
+      ln -s $lib .
+  done
 }
diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD
index 5b1e406dd..f4cbee592 100644
--- a/community/ebtables/PKGBUILD
+++ b/community/ebtables/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 59563 2011-11-28 03:11:50Z seblu $
+# $Id: PKGBUILD 60137 2011-12-05 21:42:40Z seblu $
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Michal Soltys <soltys@ziu.info>
 
 pkgname=ebtables
-pkgver='2.0.10_2'
-pkgrel=2
+pkgver='2.0.10_3'
+pkgrel=1
 pkgdesc='Ethernet bridge filtering utilities'
 arch=('i686' 'x86_64')
 backup=('etc/conf.d/ebtables')
 url='http://ebtables.sourceforge.net/'
 license=('GPL2')
+options=('!buildflags')
 source=(
   "http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz"
   'ebtables.rc'
   'ebtables.conf'
   )
-md5sums=('c5ae7fb75810fd936a5445239e853fd8'
+md5sums=('6df055d6476d3ce6bd7eed302a39c40c'
          '368825c83a2b1180d2223e61b9f3bd07'
          '86fc3622e6fc0a7a7920c90ff576cc38')
 
 build() {
   cd ${pkgname}-v${pkgver/_/-}
-  make \
-    CFLAGS='-Wunused -Wall -Werror -Wno-error=unused-but-set-variable' \
-    LDFLAGS=''
+  make CFLAGS='-Wunused -Wall -Werror -Wno-error=unused-but-set-variable'
 }
 
 package() {
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index cd6af53d8..abb7ae4ed 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 58366 2011-11-12 13:28:03Z ttopper $
+# $Id: PKGBUILD 60124 2011-12-05 19:50:21Z ibiru $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/"
 license=('BSD')
 replaces=("i3" "i3bar")
 groups=("i3")
-depends=('libxcursor' 'libev' 'yajl' 'startup-notification' 'pcre')
+depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre')
 makedepends=('bison' 'flex')
 optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'dmenu: As menu.'
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index 9ea01f608..593c314cc 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=i3lock
 pkgver=2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
-depends=('xcb-util' 'pam')
+depends=('xcb-util' 'xcb-util-image' 'xcb-util-keysyms' 'pam')
 options=('docs')
 source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
 md5sums=('6179a1611e333c8baf54093b57d50687')
diff --git a/community/iptstate/PKGBUILD b/community/iptstate/PKGBUILD
new file mode 100644
index 000000000..f0fbb6abe
--- /dev/null
+++ b/community/iptstate/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Andrea Zucchelli <zukka77@gmail.com>
+
+pkgname=iptstate
+pkgver=2.2.3
+pkgrel=1
+pkgdesc='top-like interface to netfilter connection-tracking table'
+arch=('i686' 'x86_64')
+url='http://www.phildev.net/iptstate/'
+license=('custom')
+depends=('ncurses' 'libnetfilter_conntrack')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2")
+md5sums=('5238a0c4c4f764a919aba678051698ec')
+
+build() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  install -D -m755 $pkgname "$pkgdir/usr/sbin/$pkgname"
+  install -D -m644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD
new file mode 100644
index 000000000..b197164c0
--- /dev/null
+++ b/community/ipvsadm/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=ipvsadm
+pkgver=1.26
+pkgrel=1
+pkgdesc='The IP Virtual Server administration utility'
+arch=('i686' 'x86_64')
+url='http://www.linuxvirtualserver.org/software/ipvs.html'
+license=('GPL2')
+depends=('libnl' 'popt')
+backup=('etc/conf.d/ipvsadm')
+#options=('!makeflags')
+source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz"
+        'ipvsadm.rc'
+        'ipvsadm.conf'
+        'ipvsadm.rules')
+md5sums=('eac3ba3f62cd4dea2da353aeddd353a8'
+         '0e106fce0675e014bea0f9355b947bd6'
+         'cd358130967a9cc0d31fc61282df43e7'
+         'cd6649c647e495d4d6f981542ce5a93b')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make INCLUDE="-I/usr/src/linux-`uname -r`/include -I.. -I." || return 1
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make BUILD_ROOT=${pkgdir} MANDIR=usr/share/man INIT="$pkgdir/etc/rc.d" install
+  cd "$srcdir"
+  # add initscripts
+  install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
+  install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
+  # add ipvsadm rules
+  install -D -m 644 $pkgname.rules "${pkgdir}/etc/$pkgname.rules"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipvsadm/ipvsadm.conf b/community/ipvsadm/ipvsadm.conf
new file mode 100644
index 000000000..aac7ba729
--- /dev/null
+++ b/community/ipvsadm/ipvsadm.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh et:
+
+IPVSADM_CONF='/etc/ipvsadm.rules'
diff --git a/community/ipvsadm/ipvsadm.rc b/community/ipvsadm/ipvsadm.rc
new file mode 100644
index 000000000..91ed32e3b
--- /dev/null
+++ b/community/ipvsadm/ipvsadm.rc
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/ipvsadm
+
+case "$1" in
+	start)
+    stat_busy 'Loading IPVS table'
+		if [[ -f $IPVSADM_CONF ]] && /sbin/ipvsadm-restore < "$IPVSADM_CONF"; then
+			add_daemon ipvsadm
+			stat_done
+		else
+			stat_fail
+		fi
+		;;
+	stop)
+		status 'Clearing IPVS table' /sbin/ipvsadm -C
+		rm_daemon ipvsadm
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	save)
+		stat_busy 'Saving IPVS table'
+		if /sbin/ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then
+			stat_done
+    else
+			stat_fail
+		fi
+		;;
+	*)
+		echo "usage: ${0##*/} {start|stop|restart|save}"
+esac
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ipvsadm/ipvsadm.rules b/community/ipvsadm/ipvsadm.rules
new file mode 100644
index 000000000..6740463a1
--- /dev/null
+++ b/community/ipvsadm/ipvsadm.rules
@@ -0,0 +1 @@
+# emtpy rules file for ipvsadm
diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD
index 5f7a83796..728f962c3 100644
--- a/community/medit/PKGBUILD
+++ b/community/medit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57284 2011-10-25 09:59:48Z spupykin $
+# $Id: PKGBUILD 60108 2011-12-05 11:28:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=medit
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK text editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mooedit.sourceforge.net"
@@ -14,12 +14,15 @@ depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs')
 optdepends=('ctags' 'vte: terminal emulator')
 makedepends=(pkgconfig perlxml intltool gcc-objc)
 install=medit.install
-source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2)
-md5sums=('ca790a6153eab7e2a47ac965940c0c7d')
+source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2
+	medit-terminal.patch)
+md5sums=('ca790a6153eab7e2a47ac965940c0c7d'
+         'fc4c193506901379cf2978aba950179b')
 
 build() {
   cd $srcdir/medit-$pkgver
   export PYTHON=/usr/bin/python2
+  patch -p0 <$srcdir/medit-terminal.patch
   [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
diff --git a/community/medit/medit-terminal.patch b/community/medit/medit-terminal.patch
new file mode 100644
index 000000000..434bb4829
--- /dev/null
+++ b/community/medit/medit-terminal.patch
@@ -0,0 +1,13 @@
+--- moo/moopython/plugins/terminal.py.org	2011-12-03 13:12:42.000000000 +0100
++++ moo/moopython/plugins/terminal.py	2011-12-03 13:15:19.000000000 +0100
+@@ -60,8 +60,8 @@
+             moo.prefs_set_string(COLOR_SCHEME_KEY, None)
+ 
+     def font_item_activated(self, *whatever):
+-        dlg = moo.FontSelectionDialog(D_("Pick a Font", "gtk20"))
+-        dlg.fontsel.set_property('monospace', True)
++        dlg = gtk.FontSelectionDialog(D_("Pick a Font", "gtk20"))
++        # dlg.fontsel.set_property('monospace', True)
+         old_font = self.get_font()
+         if old_font:
+             dlg.set_font_name(old_font.to_string())
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index feb8c56c5..b57dc2405 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 60085 2011-12-05 02:11:18Z svenstaro $
+# $Id: PKGBUILD 60139 2011-12-05 22:27:28Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
  
 pkgname=megaglest
-pkgver=3.6.0
+pkgver=3.6.0.1
+_pkgver=3.6.0
 pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +13,10 @@ license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu' 'ftgl' 'glew')
 makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake')
 source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('ad48987d9ecea9c6de8c175b045cc5df')
+md5sums=('099a35b97e101aa2b8facf144a5d96c8')
 
 build() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
+  cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
@@ -27,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
+  cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
 
   cd build
   make DESTDIR="$pkgdir" install
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index 73dd0a9f3..ca0b9e19a 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56797 2011-10-12 23:37:11Z ibiru $
+# $Id: PKGBUILD 60120 2011-12-05 17:20:12Z ibiru $
 # Maintainer:
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: totoloco <totoloco at gmail _dot_com>
 
 pkgname=mysql-workbench
 epoch=1
-pkgver=5.2.35
+pkgver=5.2.36
 pkgrel=1
 pkgdesc="A cross-platform, visual database design tool developed by MySQL"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,10 +17,10 @@ makedepends=('boost' 'curl' 'mesa' 'python-sphinx')
 options=('!libtool')
 source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
         ArchLinux.xml arch.patch python27.patch gcc46.patch)
-md5sums=('e8b158d2ba0413f5659cda7da9cec63e'
+md5sums=('7408d80ddb647a7d5a8749b0ecad9620'
          'c2f986cd5737413d020c55db32713c48'
          '23430d24400fd65c9fd872bd8e2411e5'
-         '47bc4cdfaa035a0132392e94c462ebf7'
+         'a3efb373bd85d876530a29bf1780fb6b'
          '43917ebc79794ba15a64f7ba820fa20b')
 
 build() {
@@ -29,16 +29,11 @@ build() {
   cp "${srcdir}/ArchLinux.xml" res/mysql.profiles
   patch -Np1 -i ${srcdir}/arch.patch
 
-  patch -Np0 -i ${srcdir}/python27.patch
+  patch -Np1 -i ${srcdir}/python27.patch
   patch -Np1 -i ${srcdir}/gcc46.patch
 
-  #we use System provided libraries
-  rm -rf ext/curl
-  rm -rf ext/yassl
-  rm -rf ext/boost
-  rm -rf ext/libsigc++
-
-  ./autogen.sh --prefix=/usr --disable-debug --disable-static
+  ./autogen.sh --prefix=/usr --with-bundled-ctemplate \
+      --disable-debug --disable-static
   make
 
   pushd ext/mysql-utilities
diff --git a/community/mysql-workbench/python27.patch b/community/mysql-workbench/python27.patch
index 5fb215cd0..4f70afe57 100644
--- a/community/mysql-workbench/python27.patch
+++ b/community/mysql-workbench/python27.patch
@@ -1,6 +1,7 @@
---- configure.in.orig	2010-12-08 16:58:57.456378836 -0800
-+++ configure.in	2010-12-08 16:59:42.179715448 -0800
-@@ -280,13 +280,13 @@
+diff -Nur mysql-workbench-gpl-5.2.36-src.old/configure.in mysql-workbench-gpl-5.2.36-src/configure.in
+--- mysql-workbench-gpl-5.2.36-src.old/configure.in	2011-12-05 15:04:56.894410445 +0000
++++ mysql-workbench-gpl-5.2.36-src/configure.in	2011-12-05 15:05:45.818268997 +0000
+@@ -245,13 +245,13 @@
  AC_CHECK_PROG(PYTHON27, python2.7, [yes])
  # Python headers
  AC_MSG_CHECKING(for Python libraries)
@@ -10,7 +11,7 @@
  cfg=sysconfig.get_config_vars()
  lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
  if os.path.exists(lib):
-     print lib")]
+     print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")]
 -PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
 +PYTHON_CFLAGS=[$(python2 -c "from distutils import sysconfig
  print sysconfig.get_python_inc()")]
diff --git a/community/openarena/PKGBUILD b/community/openarena/PKGBUILD
index 8d4830d84..e0f845ca4 100644
--- a/community/openarena/PKGBUILD
+++ b/community/openarena/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 23332 2010-08-10 01:00:21Z svenstaro $
+# $Id: PKGBUILD 60141 2011-12-05 22:52:51Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,7 +6,7 @@
 pkgname=openarena
 pkgver=0.8.5
 _oldver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A violent, sexy, multiplayer first person shooter based on the ioquake3 engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openarena.ws/"
@@ -19,14 +19,16 @@ source=(http://download.tuxfamily.org/$pkgname/rel/081/oa081.zip
         $pkgname.png
         $pkgname-server.png
         $pkgname.desktop
-        $pkgname-server.desktop)
+        $pkgname-server.desktop
+        strcpy-memmove.patch)
 md5sums=('49006bcb02b4e8ea3d06749e8f4e4887'
          'b2a0437da751cd50dd2351ed9e0c4e9d'
          '4ee696eacc4b0350f9dbb5588dcd74a2'
          'c69f824dc500d436fc631b78b6a62dc8'
          '17e2f4fa060ed97ff6fe1eaff647bcfb'
          '229c87648c10e48b523c25d24aba8372'
-         '00649517a4dd08cd9c6e99d6703f01f1')
+         '00649517a4dd08cd9c6e99d6703f01f1'
+         '723ec16d949f454588d62da499bbefca')
 
 build() {
     # uncomment to disable semi-nude models:
@@ -35,6 +37,8 @@ build() {
 
     cd $srcdir/$pkgname-engine-$_oldver
 
+    patch -Np0 < $srcdir/strcpy-memmove.patch
+
     make DEFAULT_BASEDIR=/usr/share/$pkgname \
         BUILD_CLIENT_SMP=0 \
         USE_LOCAL_HEADERS=0 \
diff --git a/community/openarena/strcpy-memmove.patch b/community/openarena/strcpy-memmove.patch
new file mode 100644
index 000000000..0123af61a
--- /dev/null
+++ b/community/openarena/strcpy-memmove.patch
@@ -0,0 +1,20 @@
+--- code/botlib/l_script.c.orig 2009-11-02 20:29:23.000000000 +0100
++++ code/botlib/l_script.c	2009-11-02 22:21:40.000000000 +0100
+@@ -1118,7 +1118,7 @@
+ {
+	if (*string == '\"')
+	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+	} //end if
+	if (string[strlen(string)-1] == '\"')
+	{
+@@ -1135,7 +1135,7 @@
+ {
+	if (*string == '\'')
+	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+	} //end if
+	if (string[strlen(string)-1] == '\'')
+	{
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index 653e28f2a..452fc41ff 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 33926 2010-11-29 11:26:18Z allan $
+# $Id: PKGBUILD 60103 2011-12-05 08:41:04Z spupykin $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 
 pkgname=ozerocdoff
 pkgver=2
-pkgrel=3
+pkgrel=4
 pkgdesc="Userspace driver for Option High Speed Mobile Devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pharscape.org/ozerocdoff.html"
 depends=('bash' 'libusb-compat')
 license=('GPL2')
-source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;topic=545.0;attach=4")
-md5sums=('88a78f9380d9591f8d20a657b72e3e5c')
+options=('!emptydirs')
+source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;topic=545.0;attach=4"
+	"remove-old-rules.patch")
+md5sums=('88a78f9380d9591f8d20a657b72e3e5c'
+         '2b28c8310b615e7283c2c38f62533c4f')
 
 build() {
   cd "${srcdir}/udev"
   make clean
+  patch -p1 <$srcdir/remove-old-rules.patch
   make
 }
 
 package() {
   cd "${srcdir}/udev"
   make DESTDIR="${pkgdir}" install
+  rm -rf $pkgdir/usr/lib/hal
+  rm -rf $pkgdir/usr/share/hal
 }
diff --git a/community/ozerocdoff/remove-old-rules.patch b/community/ozerocdoff/remove-old-rules.patch
new file mode 100644
index 000000000..0a5e7fecc
--- /dev/null
+++ b/community/ozerocdoff/remove-old-rules.patch
@@ -0,0 +1,64 @@
+diff -wbBur udev/hso.udev udev.my/hso.udev
+--- udev/hso.udev	2008-06-19 14:34:07.000000000 +0400
++++ udev.my/hso.udev	2011-12-05 12:36:34.000000000 +0400
+@@ -63,60 +63,6 @@
+ SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTR{hsotype}=="PCSC",	   SYMLINK+="wpcsc0"
+ GOTO="hso_tty_permission"
+ 
+-
+-############################### OLD SYNTAX ###############################
+-
+-LABEL="hso_old_syntax"
+-#RUN+="/binb/touch /tmp/udev-syntax-old"
+-
+-# enable Selective suspend in USB core system by a helper script
+-SUBSYSTEM=="usb", SYSFS{idVendor}=="0af0", SYSFS{bDeviceClass}=="ff", RUN+="/usr/sbin/osetsuspend udev %k"
+-
+-# send rezero command via ozerocdoff, which uses usblib for all known ZCOPTION devices, supported by bundled driver
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6711", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6731", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6751", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6771", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6791", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6811", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6911", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6951", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="6971", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7011", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7031", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7051", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7071", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7111", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7211", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7251", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7271", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7311", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="c031", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="d031", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="d033", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7301", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7361", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7401", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7501", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0af0", SYSFS{idProduct}=="7601", SYSFS{bDeviceClass}=="00", RUN+="/usr/sbin/ozerocdoff -wi 0x%s{idProduct}"
+-# Note SYSTEMS and ATTRS is not supported by udev from Xandros/EeePC
+-
+-# add device node links to all possible device
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Control",	 SYMLINK+="wctrl0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Application", SYMLINK+="wapp0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Application", SYMLINK+="wappa0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Application2",SYMLINK+="wappb0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Diagnostic",	 SYMLINK+="wdiag0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Diagnostic",	 SYMLINK+="wdiaga0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Diagnostic2", SYMLINK+="wdiagb0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="Modem",	 SYMLINK+="wmodem0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="GPS",	 SYMLINK+="wgps0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="GPS_Control", SYMLINK+="wgpsc0"
+-SUBSYSTEM=="tty", SYSFS{hsotype}=="PCSC",	 SYMLINK+="wpcsc0"
+-# Note use here SYSFS instead of ATTR to be compatible to Xandros/EeePC
+-# Note use no extra check for  SUBSYSTEMS=="usb", ATTRS{DRIVERS}="hso", because it is not supported by Xandros/EeePC
+-
+-
+ ############################### COMMON SYNTAX ###############################
+ 
+ LABEL="hso_tty_permission"
diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD
new file mode 100644
index 000000000..c362a08d0
--- /dev/null
+++ b/community/stow/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: eric <eric@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Chris Brannon <cmbrannon79@gmail.com>
+
+pkgname=stow
+pkgver=2.1.0
+pkgrel=1
+pkgdesc='GNU Stow is a program for managing the installation of software packages'
+url='http://www.gnu.org/software/stow/'
+arch=('i686' 'x86_64')
+source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
+license=('GPL2')
+md5sums=('5526fdb8c76d0aee35eb304d7f55d2f6')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
index e7b4c2d30..81f0e46a4 100644
--- a/community/tremulous/PKGBUILD
+++ b/community/tremulous/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=tremulous
 pkgver=1.1.0
-pkgrel=8
+pkgrel=9
 pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates."
 url="http://tremulous.net"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/tremulous/tremulous.desktop b/community/tremulous/tremulous.desktop
index 1d53f3aff..357c357bd 100644
--- a/community/tremulous/tremulous.desktop
+++ b/community/tremulous/tremulous.desktop
@@ -1,11 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Tremulous
-GenericName=Tremulous
-Comment=Online Team-Based RTS/FPS Hybrid
-Exec=/usr/bin/tremulous
-Icon=tremulous.xpm
-StartupNotify=true
+Comment=A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates.
+Icon=/usr/share/pixmaps/tremulous.xpm
+Exec=tremulous
 Terminal=false
-Type=Application
-Categories=Application;Game
+Categories=Game;ActionGame;
diff --git a/community/ucarp/01-fix-getopt.patch b/community/ucarp/01-fix-getopt.patch
new file mode 100644
index 000000000..9a4b21eeb
--- /dev/null
+++ b/community/ucarp/01-fix-getopt.patch
@@ -0,0 +1,11 @@
+--- ucarp-1.5.1.orig/src/ucarp_p.h
++++ ucarp-1.5.1/src/ucarp_p.h
+@@ -1,7 +1,7 @@
+ #ifndef __CARP_P_H__
+ #define __CARP_P_H__ 1
+
+-static const char *GETOPT_OPTIONS = "i:s:v:p:Pa:hb:k:x:nu:d:r:zf:BoSM";
++static const char *GETOPT_OPTIONS = "i:s:v:p:Pa:hb:k:x:nu:d:r:zf:Bo:SM";
+
+ static struct option long_options[] = {
+     { "interface", 1, NULL, 'i' },
diff --git a/community/ucarp/02-fix-downscript-on-error.c b/community/ucarp/02-fix-downscript-on-error.c
new file mode 100644
index 000000000..08af568b4
--- /dev/null
+++ b/community/ucarp/02-fix-downscript-on-error.c
@@ -0,0 +1,12 @@
+--- ucarp-1.5.1.orig/src/carp.c
++++ ucarp-1.5.1/src/carp.c
+@@ -843,6 +843,9 @@
+         if ((pfds[0].revents & (POLLERR | POLLHUP)) != 0) {
+             logfile(LOG_ERR, _("exiting: pfds[0].revents = %d"),
+                     pfds[0].revents);
++            if ((sc.sc_state != BACKUP) && (shutdown_at_exit != 0)) {
++                (void) spawn_handler(dev_desc_fd, downscript);
++            }
+             break;
+         }
+         if (gettimeofday(&now, NULL) != 0) {
diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD
new file mode 100644
index 000000000..fa1879371
--- /dev/null
+++ b/community/ucarp/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id$ 
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+
+pkgname=ucarp
+pkgver=1.5.2
+pkgrel=1
+pkgdesc='UCARP is a portable implementation of the CARP protocol'
+arch=('i686' 'x86_64')
+url='http://www.ucarp.org/project/ucarp'
+license=('GPL2')
+depends=('libpcap')
+optdepends=('iproute2')
+source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz"
+        'ucarp.rc'
+        'ucarp.conf'
+        '01-fix-getopt.patch'
+        '02-fix-downscript-on-error.c')
+md5sums=('e3caa733316a32c09e5d3817617e9145'
+         'd941d2978c5b43154a29212115729519'
+         '35d1aabe416384e6fd8bd62312dbdb25'
+         '3f20699aaf2ef8139dcd337f1e7f06ab'
+         '09d26233c37956cf08e629554a91b8cd')
+
+build() {
+  cd $pkgname-$pkgver
+  patch -N -p1 -i ../01-fix-getopt.patch
+  patch -N -p1 -i ../02-fix-downscript-on-error.c
+
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+
+  # fix iproute2 path
+  sed -i "s|/sbin|/usr/sbin|g" examples/linux/vip-down.sh
+  sed -i "s|/sbin|/usr/sbin|g" examples/linux/vip-up.sh
+}
+
+package() {
+  # add initscripts
+  install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
+  install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
+
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -D -m 755 examples/linux/vip-down.sh "$pkgdir/etc/ucarp/vip-down.sh"
+  install -D -m 755 examples/linux/vip-up.sh "$pkgdir/etc/ucarp/vip-up.sh"
+
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf
new file mode 100644
index 000000000..3b7ae2118
--- /dev/null
+++ b/community/ucarp/ucarp.conf
@@ -0,0 +1,3 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/etc/ucarp/vip-up.sh --downscript=/etc/ucarp/vip-down.sh'
diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc
new file mode 100644
index 000000000..33f40268f
--- /dev/null
+++ b/community/ucarp/ucarp.rc
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/${0##*/}
+
+NAME=ucarp
+DAEMON=/usr/sbin/ucarp
+PID=$(pidof -o %PPID $DAEMON)
+
+case "$1" in
+	start)
+		stat_busy "Starting $NAME daemon"
+		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
+		stat_fail
+	;;
+  stop)
+		stat_busy "Stopping $NAME daemon"
+		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
+		stat_fail
+	;;
+  restart)
+		$0 stop
+		$0 start
+		exit 0
+	;;
+  *) 
+		echo "usage: ${0##*/} {start|stop|restart}" >&2
+	;;
+esac
+
+exit 1
+
+# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD
index 22e762c7d..338d5972d 100644
--- a/community/xpad/PKGBUILD
+++ b/community/xpad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59076 2011-11-21 09:10:38Z spupykin $
+# $Id: PKGBUILD 60101 2011-12-05 05:18:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=xpad
-pkgver=4.0
-pkgrel=5
+pkgver=4.1
+pkgrel=1
 pkgdesc="Stickies-like notes program"
 arch=(i686 x86_64 'mips64el')
 depends=('gtk2' 'libsm' 'librsvg')
@@ -15,12 +15,12 @@ license=('GPL')
 install=xpad.install
 source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2
 	xpad-gtk-2.20.patch)
-md5sums=('a77bbabb4917c7da9b5d097d9a4e59a7'
+md5sums=('e37bfbe2331d810124c28150fdf30b3f'
          '6a3d2952b469d65ec333714991ba8284')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/xpad-gtk-2.20.patch
+#  patch -p1 <$srcdir/xpad-gtk-2.20.patch
   ./configure --prefix=/usr
   /usr/bin/make
   /usr/bin/make DESTDIR=$pkgdir install
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index ebe4ad1f6..5e36f3c18 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58277 2011-11-09 16:52:17Z spupykin $
+# $Id: PKGBUILD 60106 2011-12-05 11:21:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ML <neldoreth>
 
@@ -7,7 +7,7 @@ pkgver=0.0.8.5
 pkgrel=4
 pkgdesc="a PDF viewer"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://zathura.pwmt.org"
+url="http://pwmt.org/projects/zathura/"
 license=('custom')
 depends=('poppler-glib' 'gtk2' 'cairo')
 makedepends=('docutils')
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index d4e1c3b34..ce74ff1bb 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 142776 2011-11-15 02:49:37Z bisson $
+# $Id: PKGBUILD 144362 2011-12-05 08:15:00Z bisson $
+
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -6,8 +7,8 @@
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bitlbee
-pkgver=3.0.3
-pkgrel=6
+pkgver=3.0.4
+pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.bitlbee.org/'
@@ -15,11 +16,9 @@ license=('GPL')
 depends=('openssl' 'glib2' 'libotr')
 optdepends=('xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-        'msn.patch'
 	'xinetd'
 	'rc.d')
-sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff'
-          'fee9dcd59ad0231ffbcae822f17b68d9a8684376'
+sha1sums=('2c2742948d1ed2c83ee5db2d2fbff5e8b656b8c4'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
@@ -29,8 +28,6 @@ install=install
 build() { 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../msn.patch
-	
 	./configure --prefix=/usr \
 		--etcdir=/etc/bitlbee \
 		--pidfile=/var/run/bitlbee/bitlbee.pid \
diff --git a/extra/bitlbee/install b/extra/bitlbee/install
index 0e1caa93f..7b43c7885 100644
--- a/extra/bitlbee/install
+++ b/extra/bitlbee/install
@@ -1,5 +1,4 @@
 post_install() {
-	echo '==> Bitlbee can run through xinetd or as a daemon for now.'
 	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
 	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
 }
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 7d20afd88..bdd3b1e7a 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 143587 2011-11-26 19:38:40Z ibiru $
+# $Id: PKGBUILD 144384 2011-12-05 13:01:04Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=0.1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Color daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
-depends=('lcms2' 'sqlite3' 'polkit' 'udev' 'sane')
+depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
+optdepends=('shared-color-profiles: color profiles')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8')
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index b6634892e..820ebfdac 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144039 2011-12-02 20:49:22Z ibiru $
+# $Id: PKGBUILD 144425 2011-12-05 19:20:31Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Martin Kemp <mdkemp@elys.com>
@@ -12,10 +12,8 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
-#source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
-
-md5sums=('83a538a864b50549b7e4c79e7dd69849')
+source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('dd0a93a70784fdeb2c3e699b3c709e8a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 887d73675..7ffd1595a 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 140883 2011-10-20 05:42:30Z ibiru $
+# $Id: PKGBUILD 144389 2011-12-05 13:07:33Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
 license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash')
+depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash' 'shared-color-profiles' 'shared-color-targets')
 makedepends=('intltool' 'gtk-doc')
 install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD
index b9cf05068..8342241c1 100644
--- a/extra/gnome-desktop-sharp/PKGBUILD
+++ b/extra/gnome-desktop-sharp/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 124614 2011-05-23 14:21:08Z ibiru $
+# $Id: PKGBUILD 144403 2011-12-05 14:57:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-desktop-sharp
-pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
-makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
+makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
 	gnome-desktop-sharp-lib-target.patch)
@@ -27,7 +27,7 @@ build() {
 
 package_gnome-desktop-sharp() {
     pkgdesc="GNOME desktop bindings for C#"
-    depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+    depends=('libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 }
 
 package_libgnome-desktop-sharp() {
@@ -38,14 +38,6 @@ package_libgnome-desktop-sharp() {
     make -C gnomedesktop install DESTDIR="$pkgdir"
 }
 
-package_gnome-print-sharp() {
-    pkgdesc="Mono bindings for libgnomeprint and libgnomeprintui"
-    depends=('art-sharp' 'libgnomeprintui')
-
-    cd "$srcdir/$pkgbase-$pkgver"
-    make -C gnomeprint install DESTDIR="$pkgdir"
-}
-
 package_gtkhtml-sharp() {
     pkgdesc="Mono bindings for gtkhtml"
     depends=('gtk-sharp-2' 'gtkhtml')
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index b426842f0..9aac85d4d 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 140109 2011-10-06 19:11:44Z ibiru $
+# $Id: PKGBUILD 144401 2011-12-05 14:48:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint')
+pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck')
 pkgver=2.32.0
-pkgrel=8
+pkgrel=9
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
 sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
@@ -22,7 +22,7 @@ build() {
 }
 
 package_gnome-python-desktop() {
-  depends=('python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint' 'gnome-python')
+  depends=('python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -98,13 +98,3 @@ package_python-wnck() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C wnck install DESTDIR="${pkgdir}"
 }
-
-package_python-gnomeprint() {
-  depends=('pygtk' 'libgnomeprintui')
-  pkgdesc="Python bindings for libgnomeprintui"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  for dir in gnomeprint docs/gnomeprint docs/gnomeprintui; do
-    make -C ${dir} install DESTDIR="${pkgdir}"
-  done
-}
diff --git a/extra/java-access-bridge/PKGBUILD b/extra/java-access-bridge/PKGBUILD
index 1899c87de..19e7e1e03 100644
--- a/extra/java-access-bridge/PKGBUILD
+++ b/extra/java-access-bridge/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 137749 2011-09-10 15:06:48Z pierre $
+# $Id: PKGBUILD 144415 2011-12-05 16:00:05Z jgc $
 # Maitnainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=java-access-bridge
 pkgver=1.26.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Java bindings for the GNOME accessibility framework"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://www.gnome.org"
-depends=('java-runtime' 'gtk2' 'at-spi' 'libbonobo')
-makedepends=('intltool' 'pkgconfig' 'openjdk6' 'xorg-utils')
+depends=('java-runtime' 'gtk2' 'at-spi' 'libbonobo' 'xorg-xprop')
+makedepends=('intltool' 'pkgconfig' 'java-environment')
 options=('!libtool')
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('5f08bba19531954cec82df1bcdb89df67ee890a4')
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index cb1bc49a3..03cf079da 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 144004 2011-12-01 16:22:55Z giovanni $
-# Maintainer: arjan <arjan@archlinux.org>
+# $Id: PKGBUILD 144385 2011-12-05 13:01:06Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Arjan <arjan@archlinux.org>
 # contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdnav
-pkgver=4.1.3
-pkgrel=3
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="The library for xine-dvdnav plugin."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/"
+url="http://http://dvdnav.mplayerhq.hu/"
 depends=('libdvdread')
 options=(!libtool)
-source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav-old/${pkgname}-${pkgver}.tar.bz2"
-        'deadlock.patch')
-md5sums=('d62383c45b28816771e283515f2c27fa'
-         '864529165a1136ae4c1ccbc7b43cdb1a')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   
-  patch -Np1 -i ${srcdir}/deadlock.patch
-
   ./autogen.sh --prefix=/usr
   make
 }
diff --git a/extra/libdvdread/PKGBUILD b/extra/libdvdread/PKGBUILD
index ccd390d61..7c2420d59 100644
--- a/extra/libdvdread/PKGBUILD
+++ b/extra/libdvdread/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 80196 2010-05-13 15:59:09Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 144377 2011-12-05 12:49:24Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libdvdread
-pkgver=4.1.3
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Provides a simple foundation for reading DVD video disks"
 arch=(i686 x86_64 'mips64el')
-url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/"
+url="http://dvdnav.mplayerhq.hu"
 license=('GPL')
 depends=('glibc')
 makedepends=('libdvdcss')
 optdepends=('libdvdcss: for decoding encrypted DVDs')
 options=('!libtool')
-source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2"
-	'DVDFileStat.patch')
-md5sums=('6dc068d442c85a3cdd5ad3da75f6c6e8'
-	'7314874e246634019be929a96340437a')
+source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324)
-  patch -Np1 -i ${srcdir}/DVDFileStat.patch || return 1
 
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
+  ./autogen.sh --prefix=/usr
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
new file mode 100644
index 000000000..ec1f2617e
--- /dev/null
+++ b/extra/libgusb/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 144366 2011-12-05 11:59:52Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libgusb
+pkgver=0.1.3
+pkgrel=1
+pkgdesc="GLib wrapper around libusb1"
+arch=('i686' 'x86_64')
+url="https://gitorious.org/gusb/"
+license=('LGPL2.1')
+depends=('udev')
+source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
+options=('!libtool')
+sha256sums=('4eebb56700d9366c513bfa8f9321a60388f61bade0236a90d66854caea97f0e6')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD
index d8d115132..5d2d00ee5 100644
--- a/extra/libmsn/PKGBUILD
+++ b/extra/libmsn/PKGBUILD
@@ -1,27 +1,22 @@
-# $Id: PKGBUILD 143093 2011-11-22 18:18:21Z andrea $
+# $Id: PKGBUILD 144375 2011-12-05 12:44:46Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Charly Ghislain <charlyghislain@gmail.com>
 
 pkgname=libmsn
-pkgver=4.2
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'fix-header.patch')
-md5sums=('8887196051d2960a9279a5e00c8416a4'
-         '918b4fc89910118c63b2147eacc2c3f3')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('38e46e589720eefd71f92b6b76993bf0')
 
 build() {
   cd "${srcdir}"
-
-  patch -p0 -i "${srcdir}"/fix-header.patch
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD
index 231a7efc8..d13dd6dce 100644
--- a/extra/libsmbios/PKGBUILD
+++ b/extra/libsmbios/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 105518 2011-01-10 10:17:49Z jgc $
+# $Id: PKGBUILD 144413 2011-12-05 15:46:35Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: daniel g. siegel <dgsiegel@gmail.com> 
 
 pkgname=libsmbios
-pkgver=2.2.26
-pkgrel=2
+pkgver=2.2.28
+pkgrel=1
 pkgdesc="A library for providing access to as much BIOS information as possible"
 arch=(i686 x86_64 'mips64el')
 url="http://linux.dell.com/libsmbios/main/index.html"
@@ -15,7 +15,7 @@ makedepends=('libxml2' 'python2' 'chrpath')
 optdepends=('python2: tools')
 source=(http://linux.dell.com/libsmbios/download/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool')
-md5sums=('8ae63da74912deffa5b6b2602879c7a9')
+md5sums=('4e167e8d108e287defc3c461f50ef159')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD
index 9501083fd..0ce9aabe5 100644
--- a/extra/minicom/PKGBUILD
+++ b/extra/minicom/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 143903 2011-11-30 20:19:03Z giovanni $
+# $Id: PKGBUILD 144449 2011-12-05 22:54:28Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com>
 
 pkgname=minicom
 pkgver=2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A serial communication program"
 arch=('i686'  'x86_64' 'mips64el')
 url="http://alioth.debian.org/projects/minicom/"
 license=('GPL')
 depends=('bash' 'ncurses')
+optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
 backup=('etc/minirc.dfl')
 source=("http://alioth.debian.org/frs/download.php/3487/${pkgname}-${pkgver}.tar.gz")
 md5sums=('a5117d4d21e2c9e825edb586ee2fe8d2')
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index 2a2b212ef..b881f3a30 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84755 2010-07-04 03:32:01Z eric $
+# $Id: PKGBUILD 144422 2011-12-05 18:18:17Z jgc $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Mantainer: Roberto Carvajal <roberto@archlinux.org>
 
@@ -9,16 +9,17 @@ pkgdesc="Set of tools that can do recording of videos and playback, simple cut-a
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://mjpeg.sourceforge.net/"
-depends=('libjpeg>=8' 'libpng>=1.4.0' 'sdl' 'gcc-libs' 'libdv')
-makedepends=('gtk2>=2.18.6')
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
+makedepends=('gtk2' 'v4l-utils')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
 install=mjpegtools.install
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz)
-md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
+        mjpegtools-v4l-2.6.38.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
   ./configure --prefix=/usr --enable-largefile
   make
@@ -29,3 +30,5 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
 }
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
+         '44006d6f844017fe57aa123aa43f4508')
diff --git a/extra/mjpegtools/mjpegtools-v4l-2.6.38.patch b/extra/mjpegtools/mjpegtools-v4l-2.6.38.patch
new file mode 100644
index 000000000..6adeb921c
--- /dev/null
+++ b/extra/mjpegtools/mjpegtools-v4l-2.6.38.patch
@@ -0,0 +1,100 @@
+Index: lavtools/lavvideo.c
+===================================================================
+--- lavtools/lavvideo.c.orig
++++ lavtools/lavvideo.c
+@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler.
+  * errors here, check your linux/time.h && sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include <videodev_mjpeg.h>
+ #include <frequencies.h>
+Index: lavtools/liblavplay.c
+===================================================================
+--- lavtools/liblavplay.c.orig
++++ lavtools/liblavplay.c
+@@ -68,7 +68,8 @@
+  * errors here, check your linux/time.h && sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
++#define BASE_VIDIOCPRIVATE  192     /* 192-255 are private */
+ #else
+ #define VIDEO_MODE_PAL		0
+ #define VIDEO_MODE_NTSC		1
+Index: lavtools/liblavrec.c
+===================================================================
+--- lavtools/liblavrec.c.orig
++++ lavtools/liblavrec.c
+@@ -63,7 +63,8 @@
+  * errors here, check your linux/time.h && sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
++#define BASE_VIDIOCPRIVATE  192     /* 192-255 are private */
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+ #endif
+Index: lavtools/testrec.c
+===================================================================
+--- lavtools/testrec.c.orig
++++ lavtools/testrec.c
+@@ -89,7 +89,7 @@
+  * errors here, check your linux/time.h && sys/time.h header setup.
+  */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/soundcard.h>
+ 
+ /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit
+ AS_IF([test "x$with_v4l" != "xno"], [
+ case $host in
+   *-*-linux*)
+-  AC_CHECK_HEADER(linux/videodev.h,
++  AC_CHECK_HEADER(libv4l1-videodev.h,
+                   [have_video4linux=true
+                    AC_DEFINE(HAVE_V4L, 1,
+ 		             [Building for Linux - using the video4linux API])], [])
+@@ -173,7 +173,7 @@ esac])
+ 
+ AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"],
+         [have_video4linux=false
+-	 AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])])
++	 AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])])
+ AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
+ 
+ dnl *********************************************************************
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then :
+ 
+ case $host in
+   *-*-linux*)
+-  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
++  ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
+ if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
+   have_video4linux=true
+ 
+@@ -16407,8 +16407,8 @@ fi
+ 
+ if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then :
+   have_video4linux=false
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5
+-$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;}
++	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5
++$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;}
+ fi
+  if test x$have_video4linux = xtrue; then
+   HAVE_V4L_TRUE=
diff --git a/extra/mjpegtools/mjpegtools.install b/extra/mjpegtools/mjpegtools.install
index 1ef7d6fd3..ef149c761 100644
--- a/extra/mjpegtools/mjpegtools.install
+++ b/extra/mjpegtools/mjpegtools.install
@@ -2,7 +2,6 @@ infodir=/usr/share/info
 file=mjpeg-howto.info
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
   install-info $infodir/$file.gz $infodir/dir 2> /dev/null
 }
 
@@ -11,6 +10,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
   install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
 }
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index 9e62a0590..5bd0c1e83 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139088 2011-09-28 20:46:54Z dan $
+# $Id: PKGBUILD 144445 2011-12-05 21:10:18Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=postgresql-old-upgrade
-pkgver=9.0.5
+pkgver=9.0.6
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
@@ -37,5 +37,5 @@ package() {
   rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
 }
 
-md5sums=('86816eb8a8513532957b96045abdfef9')
-sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')
+md5sums=('4ad7e4fc31ef8b8a75a3e4243933963f')
+sha256sums=('317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 0f6da4c03..d5561089e 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139090 2011-09-28 20:46:57Z dan $
+# $Id: PKGBUILD 144443 2011-12-05 21:09:28Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.1.1
+pkgver=9.1.2
 _majorver=${pkgver%.*}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
@@ -126,13 +126,13 @@ package_postgresql() {
     "${pkgdir}/etc/logrotate.d/postgresql"
 }
 
-md5sums=('061a9f17323117c9358ed60f33ecff78'
+md5sums=('7dbff52221954c46595313eb7f92c3e0'
          '4a6e9b63f2aa50195735f2b46aba040b'
-         '2bef962971bac882022c41a72efabb96'
+         'a54d09a20ab1672adf08f037df188d53'
          '96f82c38f3f540b53f3e5144900acf17'
          'd28e443f9f65a5712c52018b84e27137')
-sha256sums=('c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2'
+sha256sums=('8d54ff514f5b2754e6e36b008c43d7bbf7daf541da608767cc5bdedb1de5db30'
             'b2931d7a719e765f14811b9109310b2418d3064bfcedef699573fc25854a2201'
-            '92fe999c34824a9b8fe4b7212d58f60247e3d0514dd38807758eac64c4198190'
+            '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e')
diff --git a/extra/postgresql/postgresql.confd b/extra/postgresql/postgresql.confd
index 2d68f2772..6001c16d1 100644
--- a/extra/postgresql/postgresql.confd
+++ b/extra/postgresql/postgresql.confd
@@ -4,7 +4,7 @@
 ## Default data directory location
 #PGROOT="/var/lib/postgres"
 ## Passed to initdb if necessary
-#INITOPTS="--locale $LANG"
+INITOPTS="--locale en_US.UTF-8"
 ## Default log file location
 #PGLOG="/var/log/postgresql.log"
 ## Additional options to pass via pg_ctl's '-o' option
diff --git a/extra/python-imaging/PKGBUILD b/extra/python-imaging/PKGBUILD
index 494b08521..3493f7e80 100644
--- a/extra/python-imaging/PKGBUILD
+++ b/extra/python-imaging/PKGBUILD
@@ -1,48 +1,48 @@
-# $Id: PKGBUILD 110352 2011-02-18 23:00:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 144447 2011-12-05 21:28:19Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=python-imaging
 pkgver=1.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="PIL. Provides image processing capabilities for python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pythonware.com/products/pil/index.htm"
 license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2') 
+depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
 makedepends=('tk' 'sane')
 optdepends=('tk' 'sane')
-provides=("pil=$pkgver")
+provides=("pil=${pkgver}")
 conflicts=('pil')
 replaces=('pil')
-source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
+source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
 md5sums=('fc14a54e1ce02a0225be8854bfba478e')
 
 build() {
-  cd $srcdir/Imaging-$pkgver
+  cd "${srcdir}"/Imaging-${pkgver}
   python2 setup.py build_ext
   cd Sane
   python2 setup.py build_ext
 }
 
 package() {
-  cd $srcdir/Imaging-$pkgver
-  python2 setup.py install --root=$pkgdir
+  cd "${srcdir}"/Imaging-${pkgver}
+  python2 setup.py install --root="${pkgdir}" --optimize=1
   
   pushd Sane
-  python2 setup.py install --root=$pkgdir
+  python2 setup.py install --root="${pkgdir}" --optimize=1
   popd
   
-  install -dm755 $pkgdir/usr/include/python2.7/
-  install -m644 -t $pkgdir/usr/include/python2.7/ libImaging/*.h 
+  install -dm755 "${pkgdir}"/usr/include/python2.7/
+  install -m644 -t "${pkgdir}"/usr/include/python2.7/ libImaging/*.h 
 
   # do not have files ending in .py in /usr/bin
   for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv $pkgdir/usr/bin/$f{.py,}
+    mv "${pkgdir}"/usr/bin/${f}{.py,}
   done
 
   # Install license
-  install -Dm644 $srcdir/Imaging-$pkgver/README \
-                 $pkgdir/usr/share/licenses/$pkgname/README
+  install -Dm644 "${srcdir}"/Imaging-${pkgver}/README \
+                 "${pkgdir}"/usr/share/licenses/${pkgname}/README
 }
-
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index cbf292c3d..4f1fe455e 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $
+# $Id: PKGBUILD 144455 2011-12-06 03:46:24Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
-pkgver=1.7.1.3
-pkgrel=3
+pkgver=1.7.2.0
+pkgrel=1
 pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('readline' 'openssl')
 source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b')
+sha1sums=('32181b08aa91309ee368e1e36a2cb337eedc425a')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,7 +20,6 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--disable-libwrap # only required while base/base-devel uses tcp_wrappers
 
 	make
 }
diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD
index 4b1dccd98..bec3abae5 100644
--- a/extra/startup-notification/PKGBUILD
+++ b/extra/startup-notification/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 124868 2011-05-24 20:23:38Z ibiru $
+# $Id: PKGBUILD 144441 2011-12-05 19:49:41Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=startup-notification
 pkgver=0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Monitor and display application startup"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
-depends=('libx11' 'xcb-util>=0.3.4')
+depends=('libx11' 'xcb-util>=0.3.8')
 options=('!libtool')
 url="http://www.freedesktop.org"
 source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz)
@@ -16,6 +16,8 @@ md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e '/AC_PATH_XTRA/d' configure.in
+  autoreconf --force --install
   ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
   make
 }
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index 690221396..1a2c4eaee 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 117379 2011-04-01 00:46:15Z giovanni $
+# $Id: PKGBUILD 144370 2011-12-05 12:08:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=tcpdump
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tcpdump.org"
 license=('BSD')
 depends=('libpcap' 'openssl')
 source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
-        tcpdump_duplicate_executable.patch)
-md5sums=('d0dd58bbd6cd36795e05c6f1f74420b0'
-         'd4c374b25d10e41b77d2c72bb9ec0d79')
+        'tcpdump_duplicate_executable.patch'
+        'ppi.h')
+md5sums=('0296d4c487c3a156879783643704bd39'
+         'b45c978dff8193ff5529d3566e7dbfa3'
+         'd898c868bb730e14dbd2afd1ad883b87')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # Add missing header file
+  cp ${srcdir}/ppi.h .
 
   # do not install tcpdump-4.1.1 executable (FS#23346)
   patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
+
   ./configure --prefix=/usr \
               --enable-ipv6
   make
@@ -27,6 +33,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 
   #install the license
diff --git a/extra/tcpdump/ppi.h b/extra/tcpdump/ppi.h
new file mode 100644
index 000000000..be7f5f02e
--- /dev/null
+++ b/extra/tcpdump/ppi.h
@@ -0,0 +1,8 @@
+typedef struct ppi_header {
+uint8_t ppi_ver;
+uint8_t ppi_flags;
+uint16_t ppi_len;
+uint32_t ppi_dlt;
+} ppi_header_t;
+
+#define PPI_HDRLEN 8
diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch
index 6e27b717a..705983ccc 100644
--- a/extra/tcpdump/tcpdump_duplicate_executable.patch
+++ b/extra/tcpdump/tcpdump_duplicate_executable.patch
@@ -1,6 +1,6 @@
---- a/Makefile.in	2010-04-06 03:18:35.000000000 +0200
-+++ b/Makefile.in	2011-04-01 02:39:10.000000000 +0200
-@@ -403,7 +403,6 @@
+--- a/Makefile.in	2011-07-24 22:58:55.000000000 +0200
++++ b/Makefile.in	2011-12-05 12:59:23.000000000 +0100
+@@ -399,7 +399,6 @@
  	[ -d $(DESTDIR)$(sbindir) ] || \
  	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index bb4583fd4..9faacb49b 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142856 2011-11-17 07:09:40Z eric $
+# $Id: PKGBUILD 144420 2011-12-05 18:18:14Z jgc $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
 
 pkgname=transcode
 _sripver=0.3-4
-pkgver=1.1.6
+pkgver=1.1.7
 pkgrel=1
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,19 +13,18 @@ url="http://tcforge.berlios.de/"
 license=('GPL')
 depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
 	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm' 'v4l-utils')
+makedepends=('nasm')
 options=('!libtool')
 source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
         subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch)
-sha1sums=('e176622b2c2834b006cda3c368ab521407d375c4'
+sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
           '591943a33235342a66c3df0625a164a1479c09ae')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|linux/videodev.h|libv4l1-videodev.h|' configure 
   ./configure --prefix=/usr \
     --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
     --enable-lame --enable-ogg --enable-vorbis --enable-theora \
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index b0804978b..f68445bb3 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 142662 2011-11-12 17:18:47Z ibiru $
+# $Id: PKGBUILD 144453 2011-12-06 03:29:55Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
-pkgver=0.1.22
-pkgrel=4
+pkgver=0.1.23
+pkgrel=1
 pkgdesc="D-Bus service for applications to request thumbnails"
 url="http://git.xfce.org/xfce/tumbler/"
 license=('GPL2' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 groups=('xfce4')
-depends=('poppler-glib' 'dbus-glib' 'bzip2' 'gdk-pixbuf2')
+depends=('poppler-glib' 'dbus-glib' '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}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-video-image.patch)
-md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9'
-         'be9b0f1c3a4b0be102774c84d5ac29e6')
+source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('c6cf6821f5d884cbf2c26f45f2fecc74')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../fix-video-image.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/xfce4 \
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index ba52989d0..7092eceee 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 139536 2011-10-03 11:27:50Z ibiru $
+# $Id: PKGBUILD 144364 2011-12-05 10:53:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.14
+pkgver=0.9.15
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://upower.freedesktop.org"
 license=('GPL')
 depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
-replaces=('devicekit-power')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
 options=('!libtool')
-source=($url/releases/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf874a4c5')
+source=($url/releases/$pkgname-$pkgver.tar.xz)
+sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/upower --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 71013e312..be817dda5 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143209 2011-11-23 11:58:47Z giovanni $
+# $Id: PKGBUILD 144439 2011-12-05 19:49:38Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.12
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -14,7 +14,7 @@ depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
          'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
          'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
          'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
          'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
 makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
diff --git a/extra/xcb-util-image/LICENSE b/extra/xcb-util-image/LICENSE
new file mode 100644
index 000000000..5e3822ccd
--- /dev/null
+++ b/extra/xcb-util-image/LICENSE
@@ -0,0 +1,267 @@
+/* Copyright (C) 2007 Bart Massey
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org>
+ * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Keith Packard <keithp@keithp.com>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
+ * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/* Copyright © 2006 Jamey Sharp.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2006 Ian Osgood
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2000 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/extra/xcb-util-image/PKGBUILD b/extra/xcb-util-image/PKGBUILD
new file mode 100644
index 000000000..18fd700ba
--- /dev/null
+++ b/extra/xcb-util-image/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 144429 2011-12-05 19:49:24Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=xcb-util-image
+pkgver=0.3.8
+pkgrel=1
+pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
+arch=('i686' 'x86_64')
+url="http://xcb.freedesktop.org"
+license=('custom')
+depends=('libxcb>=1.7' 'xcb-util>=0.3.8')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE')
+md5sums=('245a96041f373b05764148e52d2e0211'
+         '2672c2e72dedb40f773e989dd622f298')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/xcb-util-keysyms/LICENSE b/extra/xcb-util-keysyms/LICENSE
new file mode 100644
index 000000000..5e3822ccd
--- /dev/null
+++ b/extra/xcb-util-keysyms/LICENSE
@@ -0,0 +1,267 @@
+/* Copyright (C) 2007 Bart Massey
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org>
+ * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Keith Packard <keithp@keithp.com>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
+ * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/* Copyright © 2006 Jamey Sharp.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2006 Ian Osgood
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2000 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/extra/xcb-util-keysyms/PKGBUILD b/extra/xcb-util-keysyms/PKGBUILD
new file mode 100644
index 000000000..618d0687c
--- /dev/null
+++ b/extra/xcb-util-keysyms/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 144431 2011-12-05 19:49:26Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=xcb-util-keysyms
+pkgver=0.3.8
+pkgrel=1
+pkgdesc="Utility libraries for XC Binding"
+arch=('i686' 'x86_64')
+url="http://xcb.freedesktop.org"
+license=('custom')
+depends=('libxcb>=1.7')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE')
+md5sums=('c75bb20e709093580a67eaf263251b50'
+         '2672c2e72dedb40f773e989dd622f298')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/xcb-util-renderutil/LICENSE b/extra/xcb-util-renderutil/LICENSE
new file mode 100644
index 000000000..5e3822ccd
--- /dev/null
+++ b/extra/xcb-util-renderutil/LICENSE
@@ -0,0 +1,267 @@
+/* Copyright (C) 2007 Bart Massey
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org>
+ * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Keith Packard <keithp@keithp.com>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
+ * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/* Copyright © 2006 Jamey Sharp.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2006 Ian Osgood
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2000 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/extra/xcb-util-renderutil/PKGBUILD b/extra/xcb-util-renderutil/PKGBUILD
new file mode 100644
index 000000000..be4789175
--- /dev/null
+++ b/extra/xcb-util-renderutil/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 144433 2011-12-05 19:49:29Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=xcb-util-renderutil
+pkgver=0.3.8
+pkgrel=1
+pkgdesc="Utility libraries for XC Binding - Convenience functions for the Render extension"
+arch=('i686' 'x86_64')
+url="http://xcb.freedesktop.org"
+license=('custom')
+depends=('libxcb>=1.7')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE')
+md5sums=('b346ff598ee093c141f836fbc0f8f721'
+         '2672c2e72dedb40f773e989dd622f298')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/xcb-util-wm/LICENSE b/extra/xcb-util-wm/LICENSE
new file mode 100644
index 000000000..5e3822ccd
--- /dev/null
+++ b/extra/xcb-util-wm/LICENSE
@@ -0,0 +1,267 @@
+/* Copyright (C) 2007 Bart Massey
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org>
+ * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Keith Packard <keithp@keithp.com>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Bart Massey <bart@cs.pdx.edu>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/*
+ * Copyright © 2008 Ian Osgood <iano@quirkster.com>
+ * Copyright © 2008 Jamey Sharp <jamey@minilop.net>
+ * Copyright © 2008 Josh Triplett <josh@freedesktop.org>
+ * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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 names of the authors or
+ * their institutions 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 authors.
+ */
+
+/* Copyright © 2006 Jamey Sharp.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2006 Ian Osgood
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS 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 names of the authors or their
+ * institutions 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 authors.
+ */
+
+/* Copyright © 2000 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD
new file mode 100644
index 000000000..5b17b5bd8
--- /dev/null
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 144435 2011-12-05 19:49:32Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=xcb-util-wm
+pkgver=0.3.8
+pkgrel=1
+pkgdesc="Utility libraries for XC Binding - "
+arch=('i686' 'x86_64')
+url="http://xcb.freedesktop.org"
+license=('custom')
+depends=('libxcb>=1.7')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE')
+md5sums=('dda47289bc846a6a3e07824e9ec3aef8'
+         '2672c2e72dedb40f773e989dd622f298')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/xcb-util/PKGBUILD b/extra/xcb-util/PKGBUILD
index cec5c9b2c..ac43b76d3 100644
--- a/extra/xcb-util/PKGBUILD
+++ b/extra/xcb-util/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 137766 2011-09-10 16:41:45Z pierre $
+# $Id: PKGBUILD 144427 2011-12-05 19:49:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=xcb-util
-pkgver=0.3.6
-pkgrel=2
+pkgver=0.3.8
+pkgrel=1
 pkgdesc="Utility libraries for XC Binding"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org"
 license=('custom')
-depends=('libxcb>=1.4')
-makedepends=('gperf')
+depends=('libxcb>=1.7')
+makedepends=('gperf' 'xorg-util-macros')
 options=('!libtool')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
-md5sums=('dd8968b8ee613cb027a8ef1fcbdc8fc9'
+md5sums=('8ce019c4bbf20dce246b98f177cfccff'
          '2672c2e72dedb40f773e989dd622f298')
 
 build() {
@@ -23,6 +24,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() { 
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 9be6210d3..003d6ddf6 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 143035 2011-11-21 15:50:17Z jgc $
+# $Id: PKGBUILD 144437 2011-12-05 19:49:35Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
 pkgver=2.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
+depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
 conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')