Tue Nov 20 02:04:03 PST 2012

49 files changed, 1247 insertions, 269 deletions

diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD
index b1d4c62c1..ec9bcc128 100644
--- a/community/erlang-cl/PKGBUILD
+++ b/community/erlang-cl/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=erlang-cl
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686')
 pkgdesc='OpenCL binding for Erlang'
 url="http://github.com/tonyrog/cl"
diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD
index 6b914718e..7a1fbd882 100644
--- a/community/erlang-sdl/PKGBUILD
+++ b/community/erlang-sdl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79997 2012-11-15 11:48:24Z arodseth $
+# $Id: PKGBUILD 80318 2012-11-19 22:01:23Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: kappa <kappacurve@gmail.com>
 
 pkgname=erlang-sdl
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686')
 pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)'
 url='http://esdl.sourceforge.net/'
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 7f26d5117..e77471e72 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 79610 2012-11-08 22:16:13Z lfleischer $
+# $Id: PKGBUILD 80308 2012-11-19 19:18:44Z arodseth $
 # Maintainer:  Lukas Fleischer <archlinux@cryptocrack.de>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
@@ -7,26 +8,26 @@
 
 pkgname=erlang
 pkgver=R15B02
-pkgrel=1
-pkgdesc='A general-purpose concurrent functional programming language developed by Ericsson'
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
+arch=('x86_64' 'i686')
 url='http://www.erlang.org'
 license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa')
-optdepends=('wxgtk: for wx support'
-            'mesa: for wx support'
-            'unixodbc: for database support'
+depends=('ncurses' 'glu' 'wxgtk')
+makedepends=('perl' 'openssl' 'mesa')
+optdepends=('unixodbc: for database support'
             'java-environment: for Java support')
 source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz"
         "http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz")
-md5sums=('ccbe5e032a2afe2390de8913bfe737a1'
-         '974020ba533242fca759a7f5eaf628e5')
+sha256sums=('03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158'
+            'e27ed26259a2560b81e02b89190ae2a3bf0a777dc2e875f9615adab0a5388f95')
 
 build() {
   cd "$srcdir/otp_src_$pkgver"
 
+  msg2 'Configuring...'
   ./configure --prefix=/usr --enable-smp-support
+  msg2 'Compiling...'
   make
 }
 
@@ -37,16 +38,17 @@ package() {
 
   # Install documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_$pkgver"/README.md "$srcdir"/{README,COPYRIGHT} \
+  install -m0644 "$srcdir/otp_src_$pkgver/README.md" \
+    "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
   # Install compressed man pages
-  for page in "$srcdir/man/man?/*"; do
-    gzip $page
-  done
+  for page in "$srcdir/man/man?/*"; do gzip $page; done
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
   # Install license
   install -Dm0644 "$srcdir/otp_src_$pkgver/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 3f0ee6008..4b6ebcf75 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 77340 2012-10-09 04:16:59Z tdziedzic $
+# $Id: PKGBUILD 80279 2012-11-19 12:14:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
-pkgver=0.3.5.3
+pkgver=0.3.5.4
 pkgrel=1
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://hackage.haskell.org/package/bytestring-show"
 license=("BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.6.1-1")
+depends=("ghc")
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('cbcc94f57fc754685f428aba003ba058')
+md5sums=('2a4ab243c4b6fffed1fc663975a9ec6d')
 
 build() {
   cd ${srcdir}/bytestring-show-${pkgver}
@@ -30,6 +30,8 @@ build() {
 }
 
 package() {
+  depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`")
+
   cd ${srcdir}/bytestring-show-${pkgver}
   install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
   install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index f5053689a..551ac4980 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 77341 2012-10-09 04:17:04Z tdziedzic $
+# $Id: PKGBUILD 80281 2012-11-19 12:15:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-cairo
-pkgver=0.12.3.1
-pkgrel=2
+pkgver=0.12.4
+pkgrel=1
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1')
+depends=('ghc' 'cairo' 'haskell-mtl')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
 conflicts=('gtk2hs-cairo')
@@ -16,7 +16,7 @@ provides=('gtk2hs-cairo')
 replaces=('gtk2hs-cairo')
 install=gtk2hs-cairo.install
 source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('9d489fbb6cadb3d109543fe25c50195e')
+md5sums=('b9d7e8de6ba4db680c222958622d6ee6')
 
 build() {
     cd ${srcdir}/cairo-$pkgver
@@ -31,6 +31,8 @@ build() {
 }
 
 package() {
+    depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`" 'cairo' "haskell-mtl=`pacman -Q haskell-mtl | cut -f2 -d\ |cut -f1 -d-`")
+
     cd ${srcdir}/cairo-${pkgver}
     install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
     install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 2ea2ff587..517fd8644 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 77344 2012-10-09 04:17:23Z tdziedzic $
+# $Id: PKGBUILD 80282 2012-11-19 12:15:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
-pkgver=0.12.3.1
-pkgrel=2
+pkgver=0.12.4
+pkgrel=1
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'glib2')
+depends=('ghc' 'glib2')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
 install=gtk2hs-glib.install
@@ -17,13 +17,13 @@ replaces=('gtk2hs-glib')
 conflicts=('gtk2hs-glib')
 source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
         '0001-compatibility-with-ghc-7.6.1.patch')
-md5sums=('f2899bd2a2850fe95479ddb63490eb04'
+md5sums=('3172907258183466f1e604a435285c51'
          'b00660b7102542942b0b9d84b59d1f3c')
 
 build() {
     cd glib-$pkgver
 
-    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
+#    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
 
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 89e49dc07..9825c9508 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 77345 2012-10-09 04:17:32Z tdziedzic $
+# $Id: PKGBUILD 80288 2012-11-19 12:54:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-gtk
-pkgver=0.12.3.1
-pkgrel=2
+pkgver=0.12.4
+pkgrel=1
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk"
 license=('LGPL2.1')
@@ -17,12 +17,12 @@ options=('strip')
 install=gtk2hs-gtk.install
 source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
 	ghc-7.6.1.patch)
-md5sums=('b10dfe92d2e4dfe3c0c92dd349489727'
+md5sums=('165a04134cdc3aec9a9aa149c421b1de'
          '5fb93f37fe3f494b30ee682a36b8f1b6')
 
 build() {
   cd ${srcdir}/gtk-${pkgver}
-  patch -p1 <$srcdir/ghc-7.6.1.patch
+#  patch -p1 <$srcdir/ghc-7.6.1.patch
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
     --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
     --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index 347c3a31d..d839f4995 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 77349 2012-10-09 04:17:52Z tdziedzic $
+# $Id: PKGBUILD 80284 2012-11-19 12:16:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-pango
-pkgver=0.12.3
-pkgrel=3
+pkgver=0.12.4
+pkgrel=1
 pkgdesc="Binding to the pango library for Gtk2Hs."
 url="http://hackage.haskell.org/package/pango"
 license=('LGPL2.1')
@@ -16,7 +16,7 @@ conflicts=('gtk2hs-pango')
 options=('strip')
 install=gtk2hs-pango.install
 source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
-md5sums=('1ef3132cb569703d5b1bc262c9d86fe3')
+md5sums=('e498beb2d10b45ebf08bffc2296e1195')
 
 build() {
   cd ${srcdir}/pango-${pkgver}
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 106e8fe20..5fa6043b9 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79781 2012-11-12 13:17:19Z fyan $
+# $Id: PKGBUILD 80277 2012-11-19 05:28:17Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yangtse <yangtsesu@gmail.com> 
 # Contributor: WU Jun <quark at lihdd dot net>
 
 pkgname=libpinyin
-pkgver=0.7.92
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Library to deal with pinyin."
 arch=('i686' 'x86_64')
@@ -16,9 +16,6 @@ source=("https://github.com/downloads/libpinyin/libpinyin/${pkgname}-lite-${pkgv
 	'https://github.com/downloads/libpinyin/libpinyin/model.text.tar.gz')
 noextract=("model.text.tar.gz")
 
-md5sums=('697778a2164f0176add124788b1c85bb'
-	 '59be0e37b0834e41be9786d3b2fcc129')
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   cp "${srcdir}/model.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
@@ -32,3 +29,5 @@ package() {
   cd "${srcdir}/libpinyin-$pkgver"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('e53cc51355a79acf187d768befbfcff8'
+         '59be0e37b0834e41be9786d3b2fcc129')
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index e5bedda12..efe33a980 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79340 2012-11-03 08:23:48Z spupykin $
+# $Id: PKGBUILD 80299 2012-11-19 15:18:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
 	    'kvm'
-	    'openbsd-netcat: for remote management over ssh'
+	    'gnu-netcat: for remote management over ssh'
 	    'qemu'
 	    'radvd'
 	    'dmidecode')
@@ -54,7 +54,7 @@ build() {
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
+#  patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
 
   export LDFLAGS=-lX11
   export RADVD=/usr/sbin/radvd
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 880d8fb3d..4088d1020 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80241 2012-11-18 10:30:41Z andrea $
+# $Id: PKGBUILD 80294 2012-11-19 14:11:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
 arch=('i686' 'x86_64')
 url="http://mapnik.org/"
@@ -20,7 +20,7 @@ optdepends=('libxslt:         Web Map Service'
             'apache:          Web Map Service'
             'mod_fastcgi:     Web Map Service - or:'
             'mod_fcgid:       Web Map Service - or:'
-            'mod_wsgi:        Web Map Service')
+            'mod_wsgi2:       Web Map Service')
 makedepends=('scons' 'boost')
 install="mapnik.install"
 source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD
index 930f97380..608f75fb3 100644
--- a/community/mingw32-binutils/PKGBUILD
+++ b/community/mingw32-binutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61841 2012-01-08 20:30:41Z spupykin $
+# $Id: PKGBUILD 80285 2012-11-19 12:16:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 # Contributor: mosra <mosra@centrum.cz>
 
 pkgname=mingw32-binutils
-pkgver=2.22
+pkgver=2.23.1
 pkgrel=1
 _uprel=1
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ pkgdesc="A set of programs to assemble and manipulate binary and object files (m
 depends=('glibc' 'zlib')
 license=(GPL)
 source=(https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma)
-md5sums=('35419c797be081e081a664f95c3d3361')
+md5sums=('5d76604f545b151230d1c86e1b8cfab3')
 
 build() {
   [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index cc4aedeee..341337458 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 80244 2012-11-18 10:31:10Z andrea $
+# $Id: PKGBUILD 80286 2012-11-19 12:16:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=4.8.0
-#_rel=stable
-_rel=devel
-pkgrel=2
+pkgver=4.9.0
+_rel=stable
+#_rel=devel
+pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686')
 url="http://www.parrotcode.org/"
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('c00ed8867dcf69255452a2e1267906ec')
+md5sums=('ca42f4fbcc734e4cf354117cd7c073b0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 1893c4e18..abaf0e165 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75798 2012-08-31 18:47:24Z spupykin $
+# $Id: PKGBUILD 80297 2012-11-19 14:37:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
@@ -32,7 +32,7 @@ md5sums=('f6b1badef213ce8e9ef37bb3fc213390'
          'a8d77cac806a0a9adef3f93cdbeb280a'
          '1e34db5387c4e5de911e15d8a9208bdb'
          '5a3f7b839c7e0b8933748da7c5b6385b'
-         '06db41d42f9fce5449a28feb76ded556'
+         'ddb2f09c02b24dab777110f9808472e1'
          'f0d5d5b5e34a860f6f90b5628c680f46'
          'af1da6edd8c8c0dafeeb2c2c4e0c840b'
          '5ba775d4f401e2c167414caa548b71e5')
diff --git a/community/schroot/arch32-copyfiles b/community/schroot/arch32-copyfiles
index 88f093ceb..f39ee48de 100644
--- a/community/schroot/arch32-copyfiles
+++ b/community/schroot/arch32-copyfiles
@@ -2,6 +2,5 @@
 /etc/hosts
 /etc/passwd
 /etc/resolv.conf
-/etc/rc.conf
 /etc/localtime
 /etc/locale.gen
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
new file mode 100644
index 000000000..8e4cee10d
--- /dev/null
+++ b/community/squid/PKGBUILD
@@ -0,0 +1,98 @@
+# $Id: PKGBUILD 80303 2012-11-19 15:56:56Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Kevin Piche <kevin@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: Mark Coolen <mark.coolen@gmail.com>
+
+pkgname="squid"
+pkgver="3.2.3"
+pkgrel="1"
+pkgdesc="A full-featured Web proxy cache server."
+arch=('i686' 'x86_64')
+url="http://www.squid-cache.org"
+depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
+makedepends=('libcap')
+license=('GPL')
+backup=('etc/squid/squid.conf'
+        'etc/squid/mime.conf'
+        'etc/conf.d/squid')
+install=squid.install
+source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
+        'squid'
+        'squid.conf.d'
+        'squid.pam'
+        'squid.cron'
+        'squid.service')
+md5sums=('b26171dfd397defd9ee113d555691b86'
+         '02f7b5bd793f778e40834fd6457d2199'
+         '2383772ef94efddc7b920628bc7ac5b0'
+         '270977cdd9b47ef44c0c427ab9034777'
+         'b499c2b725aefd7bd60bec2f1a9de392'
+         '20e00e1aa1198786795f3da32db3c1d8')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # gcc 4.6 doesn't support -fhuge-objects.
+  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
+
+  # fix cache_dir, cache_dir size, and effective group.
+  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
+  sed '/^#cache_dir/ s/100/256/
+       /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
+
+./configure \
+      --prefix=/usr \
+      --datadir=/usr/share/squid \
+      --sysconfdir=/etc/squid \
+      --libexecdir=/usr/lib/squid \
+      --localstatedir=/var \
+      --with-logdir=/var/log/squid \
+      --with-pidfile=/run/squid.pid \
+      --enable-auth \
+      --enable-auth-basic \
+      --enable-auth-ntlm \
+      --enable-auth-digest \
+      --enable-auth-negotiate \
+      --enable-removal-policies="lru,heap" \
+      --enable-storeio="aufs,ufs,diskd" \
+      --enable-delay-pools \
+      --enable-arp-acl \
+      --enable-ssl \
+      --enable-snmp \
+      --enable-linux-netfilter \
+      --enable-ident-lookups \
+      --enable-useragent-log \
+      --enable-cache-digests \
+      --enable-referer-log \
+      --enable-arp-acl \
+      --enable-htcp \
+      --enable-carp \
+      --enable-epoll \
+      --with-filedescriptors=4096 \
+      --with-large-files \
+      --enable-arp-acl \
+      --with-default-user=proxy \
+      --enable-async-io \
+      --enable-truncate
+
+
+
+  make
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
+  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
+  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
+  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
+
+  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
+
+  # random unneeded empty dir...
+  rmdir "$pkgdir/usr/include"
+}
+
+# vim: ts=2 sw=2 et ft=sh
diff --git a/community/squid/squid b/community/squid/squid
new file mode 100644
index 000000000..da5534427
--- /dev/null
+++ b/community/squid/squid
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# source application-specific settings
+[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+pidfile=/run/squid.pid
+{ read -r PID </run/squid.pid; } 2>/dev/null
+if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then
+  rm /run/squid.pid
+fi
+
+case $1 in
+  start)
+    stat_busy "Starting squid"
+    if [[ $PID ]] || ! squid $SQUID_ARGS; then
+      stat_fail
+    else
+      add_daemon squid
+      stat_done
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping squid"
+    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
+      stat_fail
+    else
+      # squid takes forever to shutdown all its listening FDs
+      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
+        stat_append "."
+        sleep 3
+      done
+      rm_daemon squid
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/squid/squid.conf.d b/community/squid/squid.conf.d
new file mode 100644
index 000000000..ea248b76c
--- /dev/null
+++ b/community/squid/squid.conf.d
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to squid
+#
+SQUID_ARGS="-sYC"
diff --git a/community/squid/squid.cron b/community/squid/squid.cron
new file mode 100644
index 000000000..c78e51105
--- /dev/null
+++ b/community/squid/squid.cron
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# exit without error if no pidfile exists
+{ read pid </run/squid.pid; } 2>/dev/null || exit 0
+
+# make sure found PID really is a squid process
+if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
+  /usr/sbin/squid -k rotate
+fi
diff --git a/community/squid/squid.install b/community/squid/squid.install
new file mode 100644
index 000000000..e7aa5ff68
--- /dev/null
+++ b/community/squid/squid.install
@@ -0,0 +1,26 @@
+post_install() {
+  if [ -z "$(grep ^proxy: /etc/group)" ]; then
+    usr/sbin/groupadd -g 15 proxy &>/dev/null
+  fi
+
+  id proxy &>/dev/null || \
+    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
+
+  chown proxy.proxy var/{cache,log}/squid
+
+#  cat << EOF
+#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
+#EOF
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/userdel proxy &> /dev/null
+  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
+    usr/sbin/groupdel proxy &>/dev/null
+  fi
+}
+
diff --git a/community/squid/squid.pam b/community/squid/squid.pam
new file mode 100644
index 000000000..df8a8104f
--- /dev/null
+++ b/community/squid/squid.pam
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth		required	pam_unix.so
+account		required	pam_unix.so
diff --git a/community/squid/squid.service b/community/squid/squid.service
new file mode 100644
index 000000000..9d41cc243
--- /dev/null
+++ b/community/squid/squid.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Web Proxy Cache Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/squid.pid
+ExecStart=/usr/sbin/squid -sYC
+ExecStop=/usr/sbin/squid -k shutdown
+ExecReload=/usr/sbin/squid -k reconfigure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD
index 6f3bdb0d2..a03916839 100644
--- a/community/wings3d/PKGBUILD
+++ b/community/wings3d/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80086 2012-11-15 22:26:35Z arodseth $
+# $Id: PKGBUILD 80322 2012-11-19 22:41:50Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: kappa <kappacurve@gmail.com>
 
 pkgname=wings3d
 _pkgname=wings
 pkgver=1.4.1
-pkgrel=9
+pkgrel=10
 pkgdesc='3D modeling program'
 arch=('x86_64' 'i686')
 url='http://www.wings3d.com/'
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index c33ea55e4..821ecfa71 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 165168 2012-08-11 22:51:08Z pierre $
+# $Id: PKGBUILD 171604 2012-11-20 02:56:24Z allan $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/logrotate/"
 license=('GPL')
 groups=('base')
 depends=('popt' 'cron' 'gzip')
+optdepends=('cron: scheduled log rotation')
 backup=('etc/logrotate.conf')
 source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
         'noasprintf.patch'
@@ -19,7 +20,7 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar
 md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
          'cd76976b5ce37d328b452c806b55a015'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
-         '462a5f364717461537eb2ae6394ad23e'
+         '86209d257c8b8bc0ae34d6f6ef057c0f'
          'aa8ac8283908b6114483a293adcb650f')
 
 build() {
diff --git a/core/logrotate/logrotate.conf b/core/logrotate/logrotate.conf
index 88b4935cd..9c1927fec 100644
--- a/core/logrotate/logrotate.conf
+++ b/core/logrotate/logrotate.conf
@@ -25,7 +25,14 @@ include /etc/logrotate.d
 
 /var/log/wtmp {
     monthly
-    create 0664 root root
+    create 0664 root utmp
+	minsize 1M
     rotate 1
 }
 
+/var/log/btmp {
+    missingok
+    monthly
+    create 0600 root utmp
+    rotate 1
+}
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
index 86f5d8fda..2f9921d89 100644
--- a/extra/sord/PKGBUILD
+++ b/extra/sord/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=sord
-pkgver=0.10.0
+pkgver=0.10.4
 pkgrel=1
 pkgdesc="A lightweight C library for storing RDF data in memory."
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ license=('custom:ISC')
 depends=('serd>=0.18.0' 'pcre')
 makedepends=('python2')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('ad20105c0cefaed32d59c4665d682cab')
+md5sums=('9353e5b5e26c926c1a8c0e43fa577f31')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index a963f543a..b0196005d 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -1,8 +1,9 @@
 # $Id: PKGBUILD 73980 2012-07-18 00:34:26Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=suil
-pkgver=0.6.4
+pkgver=0.6.6
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
 arch=(i686 x86_64)
@@ -13,7 +14,7 @@ makedepends=('python2' 'qt' 'gtk2')
 optdepends=('qt: Qt UIs wrapping support'
             'gtk2: Gtk2 UIs wrapping support')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('9f34d3f15b4266e7cce59e3ac8f1fb3a')
+md5sums=('6b596ad806b7bf34dfba34afb48bb758')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 48007334c..7142f1fc5 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159006 2012-05-14 20:21:29Z foutrelis $
+# $Id: PKGBUILD 171600 2012-11-19 20:34:28Z foutrelis $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
@@ -16,16 +16,19 @@ makedepends=('intltool' 'libxt')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
         xfce4-smartbookmark-plugin-archlinux.patch
-        use-exo-open-instead-of-xfbrowser4.patch)
+        use-exo-open-instead-of-xfbrowser4.patch
+        fix-config-write.patch)
 sha256sums=('6c77e8fee0ec4dcee7aa34d94377e068a522b1ea650823422f2f5cca8126f2ed'
             'a126b086811b60a8f3cd1a2b818cb6b9a9c6e959e00db1499b114fa8803325e6'
-            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac')
+            '436f7cda2b2bdfee61ac3d887d17dc91094526fec8713ab84fda249850525aac'
+            '21873511b77e0fac6c85f15dc6332fcb4532ac688f3202bc839c00f372249b88')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np0 -i "$srcdir/xfce4-smartbookmark-plugin-archlinux.patch"
   patch -Np1 -i "$srcdir/use-exo-open-instead-of-xfbrowser4.patch"
+  patch -Np1 -i "$srcdir/fix-config-write.patch"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
new file mode 100644
index 000000000..0f5a25f4f
--- /dev/null
+++ b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
@@ -0,0 +1,11 @@
+diff -upr xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
+--- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c	2012-11-19 22:24:16.000000000 +0200
++++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	2012-11-19 22:24:42.000000000 +0200
+@@ -365,6 +365,7 @@ static void search_create_options(XfcePa
+     search_apply_options_cb(search);
+     gtk_widget_destroy(search->opt_dialog);
+     xfce_panel_plugin_unblock_menu(plugin);
++    search_write_config(plugin, search);
+ }
+ 
+ 
diff --git a/kernels/xe-guest-utilities/PKGBUILD b/kernels/xe-guest-utilities/PKGBUILD
index b866a6f58..a982f40d2 100644
--- a/kernels/xe-guest-utilities/PKGBUILD
+++ b/kernels/xe-guest-utilities/PKGBUILD
@@ -2,27 +2,27 @@
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=xe-guest-utilities
-pkgver=6.0.0
-pkgrel=5
+pkgver=6.0.2
+pkgrel=1
 pkgdesc="Citrix XenServer Tools"
 arch=('i686' 'x86_64')
 url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
 license=('GPL' 'LGPL')
 optdepends=('linux-libre: DomU kernel for x86_64'
 	    'linux-libre-xen: DomU kernel for i686'
-	    'kernel-libre-lts: DomU kernel for i686 (long time supported)')
+	    'linux-libre-lts-xen: DomU kernel for i686 (long time supported)')
 makedepends=('rpmextract')
-source=(ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-${pkgver}-743.i386.rpm
-	ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-xenstore-${pkgver}-743.i386.rpm
-	ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-${pkgver}-743.x86_64.rpm
-	ftp://ftp.prz.edu.pl/pub/archlinux/archrak/src/xe-guest-utilities-xenstore-${pkgver}-743.x86_64.rpm
+source=(ftp://ftp.prz.edu.pl/pub/archlinux/aur/src/xe-guest-utilities-${pkgver}-756.i386.rpm
+	ftp://ftp.prz.edu.pl/pub/archlinux/aur/src/xe-guest-utilities-xenstore-${pkgver}-756.i386.rpm
+	ftp://ftp.prz.edu.pl/pub/archlinux/aur/src/xe-guest-utilities-${pkgver}-756.x86_64.rpm
+	ftp://ftp.prz.edu.pl/pub/archlinux/aur/src/xe-guest-utilities-xenstore-${pkgver}-756.x86_64.rpm
 	xe-guest-utilities-parabola.patch
 	ip_address.patch)
 
-md5sums=('894d33028b2712650be324b7ba01c6c4'
-         'e100f97421ff522cb228aa749881a082'
-         'ffaf02afa2105d32e011a32c80921256'
-         '9b9570b5cc27832df303c8ef9cd11d36'
+md5sums=('7f1b670b6fec6f55764bc19ead41b07d'
+         '7d9a2c9db65d76f93a5df709989915af'
+         '953e858c03570105ea855fc3b32d43ff'
+         '5cb44deb684f7069b05052ed92d0ac22'
          '0d8a8ebe124d585a2b101150df8f5ff7'
          '86b4a69b412f874bf5b4db8ac8858644')
 
diff --git a/kernels/xen-docs/PKGBUILD b/kernels/xen-docs/PKGBUILD
new file mode 100644
index 000000000..6d4782bbd
--- /dev/null
+++ b/kernels/xen-docs/PKGBUILD
@@ -0,0 +1,20 @@
+pkgname=xen-docs
+pkgver=4.2.0
+pkgrel=2
+pkgdesc="Xen 4 (docs)"
+arch=(i686 x86_64)
+url="http://xen.org/"
+license="GPL"
+depends=('markdown')
+conflicts=('xen4' 'xen3' 'xen-hv-tools' 'libxen4')
+
+
+source=(http://bits.xensource.com/oss-xen/release/${pkgver}/xen-${pkgver}.tar.gz)
+
+build() {
+  cd $srcdir/xen-${pkgver}
+  unset CFLAGS LDFLAGS
+  make PYTHON=python2 DESTDIR=$pkgdir  install-docs
+ }
+
+md5sums=('f4f217969afc38f09251039966d91a87')
diff --git a/kernels/xen/09_xen b/kernels/xen/09_xen
index 094b7f427..42309149c 100755
--- a/kernels/xen/09_xen
+++ b/kernels/xen/09_xen
@@ -1,69 +1,69 @@
 #! /bin/sh -e
 
-if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then
-  . /usr/lib/grub/grub-mkconfig_lib
+if [ -f /usr/share/grub/grub-mkconfig_lib ]; then
+    . /usr/share/grub/grub-mkconfig_lib
 else
   # no grub file, so we notify and exit gracefully
-  echo "Cannot find grub config file, exiting." >&2
-  exit 0
+    echo "Cannot find grub config file, exiting." >&2
+    exit 0
 fi
 
-XEN_HYPERVISOR_CMDLINE=
+XEN_HYPERVISOR_CMDLINE="xsave=1"
 XEN_LINUX_CMDLINE="console=tty0"
 [ -r /etc/xen/grub.conf ] && . /etc/xen/grub.conf
 
 CLASS="--class gnu-linux --class gnu --class os"
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-  OS=GNU/Linux
+    OS=GNU/Linux
 else
-  OS="${GRUB_DISTRIBUTOR}"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+    OS="${GRUB_DISTRIBUTOR}"
+    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
 fi
 
 # loop-AES arranges things so that /dev/loop/X can be our root device, but
 # the initrds that Linux uses don't like that.
 case ${GRUB_DEVICE} in
-  /dev/loop/*|/dev/loop[0-9])
-    GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
-  ;;
+    /dev/loop/*|/dev/loop[0-9])
+            GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
+            ;;
 esac
 
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
     || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
     || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm"  ] ; then
-  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+    LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
-  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+    LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
 fi
 
 xen_entry ()
 {
-  os="$1"
-  xen_version="$2"
-  version="$3"
-  xen_args="$4"
-  args="$5"
-  printf "menuentry 'Xen %s / %s, with Linux %s' --class xen ${CLASS} {\n" "${xen_version}" "${os}" "${version}"
-  save_default_entry | sed -e "s/^/\t/"
-
-  if [ -z "${prepare_boot_cache}" ]; then
-    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
-  fi
-  printf '%s\n' "${prepare_boot_cache}"
-  cat << EOF
+    os="$1"
+    xen_version="$2"
+    version="$3"
+    xen_args="$4"
+    args="$5"
+    printf "menuentry 'Xen %s / %s, with Linux %s' --class xen ${CLASS} {\n" "${xen_version}" "${os}" "${version}"
+    save_default_entry | sed -e "s/^/\t/"
+
+    if [ -z "${prepare_boot_cache}" ]; then
+        prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+    fi
+    printf '%s\n' "${prepare_boot_cache}"
+    cat << EOF
        echo    '$(printf "Loading Xen %s ..." ${xen_version})'
        multiboot       ${rel_dirname}/${xen_basename} ${rel_dirname}/${xen_basename} ${xen_args}
        echo    $(printf "$(gettext "Loading Linux %s ...")" ${version})
        module  ${rel_dirname}/${basename} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 EOF
-  if test -n "${initrd}" ; then
-    cat << EOF
+    if test -n "${initrd}" ; then
+        cat << EOF
        echo    "Loading initial ramdisk ..."
        module  ${rel_dirname}/${initrd}
 EOF
-  fi
-  cat << EOF
+    fi
+    cat << EOF
 }
 EOF
 }
@@ -74,50 +74,48 @@ done`
 prepare_boot_cache=
 
 while [ "x$xen_list" != "x" ] ; do
-  xen=`version_find_latest $xen_list`
-  echo "Found Xen hypervisor image: $xen" >&2
-  xen_basename=`basename $xen`
-  xen_dirname=`dirname $xen`
-  rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
-  xen_version=`echo $xen_basename | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"`
-  alt_xen_version=`echo $xen_version | sed -e "s,\.old$,,g"`
-
-  xen_configfiles=`grep -l 'CONFIG_XEN_PRIVILEGED_GUEST=y' /boot/config-*`
-
-  list="/boot/vmlinuz-linux-libre";
-
-  while [ "x$list" != "x" ] ; do
-    linux=`version_find_latest $list`
-    echo -e "\tFound linux image: $linux" >&2
-    basename=`basename $linux`
-    dirname=`dirname $linux`
-    rel_dirname=`make_system_path_relative_to_its_root $dirname`
-    version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
-    base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"`
-    alt_version="${base_init}-fallback"
-    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-    initrd=
-
-    for i in "${base_init}.img"; do
-       if test -e "${dirname}/${i}" ; then
-         initrd="$i"
-         break
-       fi
-    done
-    if test -n "${initrd}" ; then
-      echo -e "\tFound initrd image: ${dirname}/${initrd}" >&2
-    else
+    xen=`version_find_latest $xen_list`
+    echo "Found Xen hypervisor image: $xen" >&2
+    xen_basename=`basename $xen`
+    xen_dirname=`dirname $xen`
+    rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
+    xen_version=`echo $xen_basename | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"`
+    alt_xen_version=`echo $xen_version | sed -e "s,\.old$,,g"`
+
+    list="/boot/vmlinuz-linux";
+
+    while [ "x$list" != "x" ] ; do
+        linux=`version_find_latest $list`
+        echo -e "\tFound linux image: $linux" >&2
+        basename=`basename $linux`
+        dirname=`dirname $linux`
+        rel_dirname=`make_system_path_relative_to_its_root $dirname`
+        version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+        base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"`
+        alt_version="${base_init}-fallback"
+        linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+        initrd=
+
+        for i in "${base_init}.img"; do
+            if test -e "${dirname}/${i}" ; then
+                initrd="$i"
+                break
+            fi
+        done
+        if test -n "${initrd}" ; then
+            echo -e "\tFound initrd image: ${dirname}/${initrd}" >&2
+        else
       # "UUID=" magic is parsed by initrds.  Since there's no initrd, it can't work here.
-      linux_root_device_thisversion=${GRUB_DEVICE}
-    fi
+            linux_root_device_thisversion=${GRUB_DEVICE}
+        fi
 
-    xen_entry "${OS}" "${xen_version}" "${version}" \
-        "${XEN_HYPERVISOR_CMDLINE}" \
-       "${XEN_LINUX_CMDLINE}"
+        xen_entry "${OS}" "${xen_version}" "${version}" \
+            "${XEN_HYPERVISOR_CMDLINE}" \
+            "${XEN_LINUX_CMDLINE}"
 
-    list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
-  done
+        list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+    done
 
-  xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $xen | tr '\n' ' '`
+    xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $xen | tr '\n' ' '`
 done
 
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
index c51ffeaa9..33a2dccb1 100644
--- a/kernels/xen/PKGBUILD
+++ b/kernels/xen/PKGBUILD
@@ -1,104 +1,122 @@
-# Maintainer M0Rf30
-# Contributor WaxyMouthfeel 
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: Limao Luo <luolimao+AUR@gmail.com>
+# Contributor: Luceo
+# Contributor: Revellion
+
 pkgname=xen
-pkgver=4.1.2
-pkgrel=3.1
-pkgdesc="Xen 4 (hypervisor and tools)"
+pkgver=4.2.0
+pkgrel=12
+pkgdesc="Xen Hypervisor & Tools"
 arch=(i686 x86_64)
-url="http://xen.org/"
-license="GPL"
-
-if [[ $CARCH == "x86_64" ]]; then
-	depends=('xz' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'lib32-glibc')
-else
-	depends=('xz' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'glibc')
-fi
-
-optdepends=('xen-docs: Xen Official Documentation')
-makedepends=('dev86' 'ocaml-findlib' 'iasl')
-conflicts=('xen4' 'xen3' 'xen-hv-tools' 'libxen4')
-provides=('xen')
-backup=('etc/xen/xend-config.sxp' 'etc/xen/xend-pci-permissive.sxp' 'etc/xen/xend-pci-quirks.sxp')
-options=(!strip)
-optional=(xen-docs)
-source=(http://bits.xensource.com/oss-xen/release/${pkgver}/xen-${pkgver}.tar.gz
-	09_xen
-	xen.patch
-	parabolainit.patch
-	dom0_xz_decompression.patch
-	24341.patch
-	24344.patch
-	24345.patch)
+url=http://xen.org
+license=(GPL)
+depends=(bin86 bluez bridge-utils glib2 gnutls libaio libjpeg-turbo libpng lzo2 sdl wget vde2 yajl)
+[[ "$CARCH" == "x86_64" ]] && depends+=(lib32-glibc)
+makedepends=(dev86 git iasl markdown ocaml-findlib)
+optdepends=('xen-docs: Official Xen Documentation')
+conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc})
+backup=(etc/$pkgname/xend-{config,pci-{permissive,quirks}}.sxp etc/modules-load.d/$pkgname.conf)
+options=(!buildflags !emptydirs !strip)
+install=$pkgname.install
+source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
+    09_xen
+    archinit.patch
+    texi2html.patch
+    proc-xen.mount
+    var-lib-xenstored.mount
+    xenconsoled.service
+    xendomains.service
+    xendomU@.service
+    xenstored.service
+    $pkgname.conf)
+sha256sums=('43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb'
+    'e8dd740c0f18ea41bb80afad36ca981669e6ab86eb3848fbb40f0dff3b8aa3e6'
+    '35900d3ae2f2cc27834b8a7cb11f134b582f01bde033598c407c8e58ad58fdb9'
+    '08e5bf65c833a608470ad118ce369e32f9c267e1787f2900c06708af321225e6'
+    '139eed988bfaf8edc8ccdfd0b668382bd63db48ce17be91776182a7e28e9d88c'
+    'c19146931c6ab8e53092bd9b2ebbfda5c76fd22ad3b1d42dcda3dd1b61f123ff'
+    'ba8f1c10b3f3df1f9fda0782a691fed67661e36f49be74471c86850639fee3ba'
+    '0bd45d9de6456c4f9adf32e726f2db3a3cd0423c1d161b442e8a1666d2e68e3f'
+    '1862a14607582d14247b74435dfb16411fd68904aa19e2a93c5e6ac301169d3c'
+    '0a1960fd51a2f4e8e856c7392e33cc9607ac4a80e9d68b316b6a4281f34728e0'
+    '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c')
+sha512sums=('4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70'
+    '23402f54e1a40c058566d6c0f18ac2e89ea85eea8bedf669f059e30ad76b3b90d81b7ff34d8e8c07ab4fea7f82ae32c80a66df2fd95fb3b296e982cdcc93d0b6'
+    '9ce0c009f055c9be42435be9eeeec980285cbef4fb52cbd8d81f76ae1e7760575b5c9f958e3d44612d2740eafa1e18ee48f30a5571f0c06bd031d4e102abb22f'
+    '562f12e723116c705fc9d0fd4a2afd382a93465be7f616d1e20e87daf39c11029fbc57ec46e38d3ff61c482fdc9ac4df9e07600a77515867d9da6f0faf3da7f9'
+    '6afdf16e32bb837faf6333334f86855a746f1f46fee9673a4fddc62eecf41f9856bc34397807203c6f5071f0b1ce74532214084042154585c0d39514450db25c'
+    '00e340f4d3635e3850ca24baea1da08467523c17815feb74161e18397b607fef904db2165fd9bf4632a6e8a6e37aeddad4e56965e1c99b5213c98b3f9afc6aad'
+    '27d7289a8bf6e15bddcb360287001429205b57ee4d791b0337328879ffd76b8e375e3c1dd0de0ab57dd4bd1e2a2bc1748c44cc05b2528632a3e6af60f626de9d'
+    'f00034f8b826b828659a0177f0a6454113c625e69a817dfe32e461767f6643e0288bfc2a22d23358504240df627af6e3b8f5ffa0077e241e590b33d3f252e74c'
+    '31fefc739f0f0e568df03dcf9aa02e0265ff4fbf77e7ae62d6a318fcc34e87a0ffd3fc4b84ff8c9cc95511e2e74b7b61e6b5471cd0b3cd47ee0da86b1ea90268'
+    '87aceb1c646e49940bfbc47da85d7e20c9436449b152c0842b357033f66aba68a590f1d56c4a3f437d093047a611f28fd67d381692d9b21a582e598ecf1a72a2'
+    'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b')
 
 build() {
-  
-
-  cd $srcdir/xen-${pkgver}
-        
-        patch -p1 -i ../xen.patch
-        patch -p1 -i ../parabolainit.patch
-	patch -p1 -i ../dom0_xz_decompression.patch
-	patch -p1 -i ../24341.patch
-	patch -p1 -i ../24344.patch
-	patch -p1 -i ../24345.patch 	
-
-unset CFLAGS LDFLAGS
-
-make PYTHON=python2 DESTDIR=$pkgdir  install-xen
-make PYTHON=python2 DESTDIR=$pkgdir  install-tools
-#make PYTHON=python2 DESTDIR=$pkgdir  install-stubdom
-  
-  sed -i 's#XENDOM_CONFIG=/etc/sysconfig/xendomains#XENDOM_CONFIG=/etc/conf.d/xendomains#' $pkgdir/etc/init.d/xendomains
-  sed -i "s#touch /var/lock/subsys/xend#mkdir -p /var/lock/subsys\n	touch /var/lock/subsys/xend#" $pkgdir/etc/init.d/xend
-
-  [ -d $pkgdir/usr/lib64 ] && ( cd $pkgdir/usr && cp -R lib64/* lib/ && rm -R lib64 )
-  ( cd $pkgdir/etc && mv init.d rc.d ) || return 1
-  rm -f $pkgdir/usr/share/man/man1/qemu-img.1* \
-       $pkgdir/usr/share/man/man1/qemu.1*
-  # First experiment to generate grub2.cfg entry
-  mkdir -p $pkgdir/etc/grub.d
-  chmod +x $srcdir/09_xen
-  cp $srcdir/09_xen  $pkgdir/etc/grub.d
-
-  ############ kill unwanted stuff ############
-
-# stubdom: newlib
-rm -rf $pkgdir/usr/*-xen-elf
-
-# hypervisor symlinks
-rm -rf $pkgdir/boot/xen-4.1.gz
-rm -rf $pkgdir/boot/xen-4.gz
-rm -rf $pkgdir/boot/xen.gz
-
-# silly doc dir fun
-rm -fr $pkgdir/usr/share/doc/xen
-rm -rf $pkgdir/usr/share/doc/qemu
-
-# Pointless helper
-rm -f $pkgdir/usr/sbin/xen-python-path
-
-# qemu stuff (unused or available from upstream)
-rm -rf $pkgdir/usr/share/xen/man
-rm -rf $pkgdir/usr/bin/qemu-*-xen
-for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \
-         pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
-         vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb
-do
-	rm -f $pkgdir/usr/share/xen/qemu/$file
-done
-
-# adhere to Static Library Packaging Guidelines
-rm -rf $pkgdir/usr/lib/*.a
-
-  
+    cd "$srcdir"/$pkgname-$pkgver/
+
+    patch -Np1 -i ../archinit.patch
+    patch -Np1 -i ../texi2html.patch
+
+    ./autogen.sh
+    ./configure PYTHON=/usr/bin/python2
 }
 
-md5sums=('73561faf3c1b5e36ec5c089b5db848ad'
-         '8d50beba46ffd89a3b959176245b676e'
-         'f149bae1a6b420e49c51b9f3a74338a4'
-         '7a1ed81ecc828037724bb3280058c9fc'
-         '4aebccf16b578ed97aa8bab945011f35'
-	 '1b0c05a555bc99fc8416dd52b6c6ae95'
-	 'b6225be5bec3fe462f9166f9fde9c347'
-	 'd282946a2873a78b2b2c3944571eb2fe')
+package() {
+    cd "$srcdir"/$pkgname-$pkgver/
+
+    make PYTHON=python2 DESTDIR="$pkgdir" install-xen install-tools
+    # stubdom won't build with multiple makethreads
+    make -j1 PYTHON=python2 DESTDIR="$pkgdir" install-stubdom
+
+    cd ../
+    for f in ${source[@]}; do
+        [[ $f =~ .mount || $f =~ .service ]] && install -Dm644 $f "$pkgdir"/usr/lib/systemd/system/$f
+    done
+    install -Dm644 $pkgname.conf "$pkgdir"/etc/modules-load.d/$pkgname.conf
+    install -Dm755 09_xen "$pkgdir"/etc/grub.d/09_xen
+
+    cd "$pkgdir"
+    sed -i ':XENDOM_CONFIG=/etc/:s:sysconfig/xendomains:conf.d/xendomains:' etc/init.d/xendomains
+    sed -i 's:touch /var/lock/subsys/xend:mkdir -p /var/lock/subsys\n       &:' etc/init.d/xend
+
+    if [[ -d usr/lib64 ]]; then
+        cd usr/
+        cp -r lib64/* lib/
+        rm -rf lib64
+    fi
+
+    mv etc/{init,rc}.d
+
+    mv usr/local/etc/qemu/ etc/
+    rm -rf usr/local/share/
+    mv etc/rc.d/xendomains etc/xen/scripts/xendomains
+
+    ##### Kill unwanted stuff #####
+    # stubdom: newlib
+    rm -rf usr/*-xen-elf
+
+    # hypervisor symlinks
+    rm -f boot/xen{,-4,-4.2}.gz
+
+    # silly doc dir fun
+    rm -rf usr/share/doc/xen
+    rm -rf usr/share/doc/qemu
+
+    # Pointless helper
+    rm -f usr/sbin/xen-python-path
+
+    # qemu stuff (unused or available from upstream)
+    rm -rf usr/share/xen/man
+    rm -rf usr/bin/qemu-*-xen
+    for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \
+        pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
+        vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb; do
+        rm -f usr/share/xen/qemu/$file
+    done
+
+    # adhere to Static Library Packaging Guidelines
+    rm -rf usr/lib/*.a
+
+    # Fix errors from deprecated xend
+    rm etc/udev/rules.d/xend.rules
+}
diff --git a/kernels/xen/archinit.patch b/kernels/xen/archinit.patch
new file mode 100644
index 000000000..f5bece6e2
--- /dev/null
+++ b/kernels/xen/archinit.patch
@@ -0,0 +1,450 @@
+--- a/tools/hotplug/Linux/init.d/xencommons	2011-07-03 03:08:44.953747064 -0700
++++ b/tools/hotplug/Linux/init.d/xencommons	2011-07-05 13:47:54.627029164 -0700
+@@ -17,6 +17,8 @@
+ # Short-Description: Start/stop xenstored and xenconsoled
+ # Description:       Starts and stops the daemons neeeded for xl/xend
+ ### END INIT INFO
++. /etc/rc.conf
++. /etc/rc.d/functions
+ 
+ if [ -d /etc/sysconfig ]; then
+ 	xencommons_config=/etc/sysconfig
+@@ -26,7 +28,7 @@
+ 
+ test -f $xencommons_config/xencommons && . $xencommons_config/xencommons
+ 
+-XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
++XENCONSOLED_PIDFILE=/run/daemons/xenconsoled.pid
+ shopt -s extglob
+ 
+ # not running in Xen dom0 or domU
+@@ -69,7 +71,7 @@
+ 	modprobe pciback 2>/dev/null
+ 	modprobe xen-acpi-processor 2>/dev/null
+ 	modprobe blktap2 2>/dev/null || modprobe blktap 2>/dev/null
+-	mkdir -p /var/run/xen
++	#mkdir -p /var/run/xen
+ 
+ 	if ! `xenstore-read -s / >/dev/null 2>&1`
+ 	then
+@@ -78,55 +80,66 @@
+ 		test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log"
+ 
+ 		if [ -n "$XENSTORED" ] ; then
+-		    echo -n Starting $XENSTORED...
+-		    $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
++		    #echo -n Starting $XENSTORED...
++		    stat_busy "Starting $XENSTORED"
++		    $XENSTORED --pid-file /run/daemons/xenstored.pid $XENSTORED_ARGS
+ 		elif [ -x /usr/sbin/oxenstored ] ; then
+-		    echo -n Starting oxenstored...
+-		    /usr/sbin/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
++		    #echo -n Starting oxenstored...
++		    stat_busy "Starting oxenstored"
++		    /usr/sbin/oxenstored --pid-file /run/daemons/xenstored.pid $XENSTORED_ARGS
+ 		elif [ -x /usr/sbin/xenstored ] ; then
+-		    echo -n Starting C xenstored...
+-		    /usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
++		    #echo -n Starting C xenstored...
++		    stat_busy "Starting C xenstored"
++		    /usr/sbin/xenstored --pid-file /run/daemons/xenstored.pid $XENSTORED_ARGS
+ 		else
+-		    echo "No xenstored found"
++		    #echo "No xenstored found"
++		    stat_fail
+ 		    exit 1
+ 		fi
+ 
+ 		# Wait for xenstored to actually come up, timing out after 30 seconds
+                 while [ $time -lt $timeout ] && ! `xenstore-read -s / >/dev/null 2>&1` ; do
+-                    echo -n .
++                    #echo -n .
+ 		    time=$(($time+1))
+                     sleep 1
+                 done
+-		echo
++		#echo
+ 
+ 		# Exit if we timed out
+ 		if ! [ $time -lt $timeout ] ; then
+-		    echo Could not start xenstored
++		    #echo Could not start xenstored
++		    stat_fail
+ 		    exit 1
+ 		fi
+ 
+-		echo Setting domain 0 name...
++		#echo Setting domain 0 name...
++		stat_busy "Setting domain0 name"
+ 		xenstore-write "/local/domain/0/name" "Domain-0"
+ 	fi
+ 
+-	echo Starting xenconsoled...
++	#echo Starting xenconsoled...
++	stat_busy "Starting xenconsoled"
+ 	test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE"
+ 	xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
+ 	test -z "$XENBACKENDD_DEBUG" || XENBACKENDD_ARGS="-d"
+ 	test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS
+-	echo Starting QEMU as disk backend for dom0
++	#echo Starting QEMU as disk backend for dom0
++	stat_busy "Starting QEMU as disk backend for dom0"
+ 	test -z "$QEMU_XEN" && QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386
+ 	$QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize -monitor /dev/null
++	stat_done
+ }
+ do_stop () {
+-        echo Stopping xenconsoled
++        #echo Stopping xenconsoled
++        stat_busy "Stopping xenconsoled"
+ 	if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then
+ 		kill $pid
+ 		while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+ 		rm -f $XENCONSOLED_PIDFILE
+ 	fi
++	stat_done
+ 
+-	echo WARNING: Not stopping xenstored, as it cannot be restarted.
++	#echo WARNING: Not stopping xenstored, as it cannot be restarted.
+ }
+ 
+ case "$1" in
+--- a/tools/hotplug/Linux/init.d/xend	2011-07-03 03:08:44.953747064 -0700
++++ b/tools/hotplug/Linux/init.d/xend	2011-07-05 01:47:40.981951191 -0700
+@@ -18,6 +18,10 @@
+ # Description:       Starts and stops the Xen control daemon.
+ ### END INIT INFO
+ 
++. /etc/rc.conf
++. /etc/rc.d/functions
++
++
+ shopt -s extglob
+ 
+ # Wait for Xend to be up
+@@ -37,23 +41,30 @@
+ case "$1" in
+   start)
+ 	if [ -z "`ps -C xenconsoled -o pid=`" ]; then
+-		echo "xencommons should be started first."
++	 printhl "xencommons should be started first."
+ 		exit 1
+ 	fi
+ 	# mkdir shouldn't be needed as most distros have this already created. Default to using subsys.
+ 	# See docs/misc/distro_mapping.txt
+-	mkdir -p /var/lock
+-	if [ -d /var/lock/subsys ] ; then
+-		touch /var/lock/subsys/xend
++	if [ -d /run/lock/subsys ] ; then
++		touch /run/lock/subsys/xend
+ 	else
+-		touch /var/lock/xend
++		touch /run/lock/xend
+ 	fi
++	stat_busy "Starting xend"
+ 	xend start
+ 	await_daemons_up
++	stat_done
++	add_daemon xend
+ 	;;
++
++
+   stop)
++   stat_busy "Stopping xend"
+ 	xend stop
+-	rm -f /var/lock/subsys/xend /var/lock/xend
++	rm -f /run/lock/xend /var/lock/xend
++	stat_done
++	rm_daemon xend
+ 	;;
+   status)
+ 	xend status
+@@ -62,8 +73,10 @@
+         xend reload
+         ;;
+   restart|force-reload)
++   stat_busy "Restarting xend"
+ 	xend restart
+ 	await_daemons_up
++	stat_done
+ 	;;
+   *)
+ 	# do not advertise unreasonable commands that there is no reason
+--- a/tools/hotplug/Linux/init.d/xendomains	2011-07-03 03:08:44.953747064 -0700
++++ b/tools/hotplug/Linux/init.d/xendomains	2011-07-05 13:46:36.208222760 -0700
+@@ -26,6 +26,9 @@
+ # Description:       Start / stop domains automatically when domain 0 
+ #                    boots / shuts down.
+ ### END INIT INFO
++. /etc/rc.conf
++. /etc/rc.d/functions
++
+ 
+ CMD=xm
+ $CMD list &> /dev/null
+@@ -46,93 +49,52 @@
+ 	exit 0
+ fi
+ 
+-# See docs/misc/distro_mapping.txt
+-if [ -d /var/lock/subsys ]; then
+-	LOCKFILE=/var/lock/subsys/xendomains
+-else
+-	LOCKFILE=/var/lock/xendomains
+-fi
+-
+-if [ -d /etc/sysconfig ]; then
+-	XENDOM_CONFIG=/etc/sysconfig/xendomains
+-else
+-	XENDOM_CONFIG=/etc/default/xendomains
+-fi
++LOCKFILE=/run/lock/xendomains
++XENDOM_CONFIG=/etc/default/xendomains
+ 
+-test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
++test -r $XENDOM_CONFIG || { 
++	printhl "$XENDOM_CONFIG not existing";
+ 	if [ "$1" = "stop" ]; then exit 0;
+ 	else exit 6; fi; }
+ 
+ . $XENDOM_CONFIG
+ 
+-# Use the SUSE rc_ init script functions;
+-# emulate them on LSB, RH and other systems
+-if test -e /etc/rc.status; then
+-    # SUSE rc script library
+-    . /etc/rc.status
+-else    
+-    _cmd=$1
+-    declare -a _SMSG
+-    if test "${_cmd}" = "status"; then
++_cmd=$1
++declare -a _SMSG
++if test "${_cmd}" = "status"; then
+ 	_SMSG=(running dead dead unused unknown)
+ 	_RC_UNUSED=3
+-    else
++else
+ 	_SMSG=(done failed failed missed failed skipped unused failed failed)
+ 	_RC_UNUSED=6
+-    fi
+-    if test -e /etc/init.d/functions; then
+-	# REDHAT
+-	. /etc/init.d/functions
+-	echo_rc()
+-	{
+-	    #echo -n "  [${_SMSG[${_RC_RV}]}] "
+-	    if test ${_RC_RV} = 0; then
+-		success "  [${_SMSG[${_RC_RV}]}] "
+-	    else
+-		failure "  [${_SMSG[${_RC_RV}]}] "
+-	    fi
+-	}
+-    elif test -e /lib/lsb/init-functions; then
+-	# LSB    
+-    	. /lib/lsb/init-functions
+-        if alias log_success_msg >/dev/null 2>/dev/null; then
+-	  echo_rc()
+-	  {
+-	       echo "  [${_SMSG[${_RC_RV}]}] "
+-	  }
+-        else
+-	  echo_rc()
+-	  {
+-	    if test ${_RC_RV} = 0; then
+-		log_success_msg "  [${_SMSG[${_RC_RV}]}] "
+-	    else
+-		log_failure_msg "  [${_SMSG[${_RC_RV}]}] "
+-	    fi
+-	  }
+-        fi
+-    else    
+-	# emulate it
+-	echo_rc()
+-	{
+-	    echo "  [${_SMSG[${_RC_RV}]}] "
+-	}
+-    fi
+-    rc_reset() { _RC_RV=0; }
+-    rc_failed()
+-    {
++fi
++
++
++
++echo_rc() {
++	echo
++	printhl "Return Status: ${_SMSG[${_RC_RV}]}"
++}
++
++
++rc_reset() { _RC_RV=0; }
++
++
++rc_failed() {
+ 	if test -z "$1"; then 
+-	    _RC_RV=1;
++		_RC_RV=1;
+ 	elif test "$1" != "0"; then 
+-	    _RC_RV=$1; 
+-    	fi
++		_RC_RV=$1; 
++	fi
+ 	return ${_RC_RV}
+-    }
+-    rc_check()
+-    {
++}
++
++rc_check() {
+ 	return rc_failed $?
+-    }	
+-    rc_status()
+-    {
++}	
++
++
++rc_status() {
+ 	rc_failed $?
+ 	if test "$1" = "-r"; then _RC_RV=0; shift; fi
+ 	if test "$1" = "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi
+@@ -140,26 +102,24 @@
+ 	if test "$1" = "-v"; then echo_rc; shift; fi
+ 	if test "$1" = "-r"; then _RC_RV=0; shift; fi
+ 	return ${_RC_RV}
+-    }
+-    rc_exit() { exit ${_RC_RV}; }
+-    rc_active() 
+-    {
++}
++
++
++rc_exit() { exit ${_RC_RV}; }
++
++
++rc_active() {
+ 	if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi
+ 	if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi
+ 	return 1
+-    }
+-fi
++}
+ 
+-if ! which usleep >&/dev/null
+-then
+-  usleep()
+-  {
+-    if [ -n "$1" ]
+-    then
+-      sleep $(( $1 / 1000000 ))
+-    fi
+-  }
+-fi
++usleep() {
++	if [ -n "$1" ]
++	then
++	  sleep $(( $1 / 1000000 ))
++	fi
++}
+ 
+ # Reset status of this service
+ rc_reset
+@@ -240,10 +200,12 @@
+ start() 
+ {
+     if [ -f $LOCKFILE ]; then 
+-	echo -e "xendomains already running (lockfile exists)"
++	stat_busy "xendomains already running (lockfile exists)"
++	stat_fail
+ 	return; 
+     fi
+ 
++    printhl "Starting Xen Domains"
+     saved_domains=" "
+     if [ "$XENDOMAINS_RESTORE" = "true" ] &&
+        contains_something "$XENDOMAINS_SAVE"
+@@ -304,6 +266,7 @@
+ 	    fi
+ 	done
+     fi
++    add_daemon xendomains
+ }
+ 
+ all_zombies()
+@@ -357,7 +320,7 @@
+     if test "$XENDOMAINS_AUTO_ONLY" = "true"; then
+ 	rdnames
+     fi
+-    echo -n "Shutting down Xen domains:"
++    printhl "Shutting down Xen domains"
+     name=;id=
+     while read LN; do
+ 	parseln "$LN" || continue
+@@ -470,6 +433,7 @@
+     rm -f $LOCKFILE
+     
+     exec 2>&3
++    rm_daemon xendomains
+ }
+ 
+ check_domain_up()
+--- a/tools/hotplug/Linux/init.d/xen-watchdog	2011-07-03 03:08:44.957080397 -0700
++++ b/tools/hotplug/Linux/init.d/xen-watchdog	2011-07-05 13:20:22.515289867 -0700
+@@ -17,49 +17,32 @@
+ ### END INIT INFO
+ #
+ 
++. /etc/rc.conf
++. /etc/rc.d/functions
++
+ DAEMON=/usr/sbin/xenwatchdogd
+ base=$(basename $DAEMON)
++initname="xen-watchdog"
+ 
+-# Source function library.
+-if [ -e  /etc/init.d/functions ] ; then
+-    . /etc/init.d/functions
+-elif [ -e /lib/lsb/init-functions ] ; then
+-    . /lib/lsb/init-functions
+-    success () {
+-        log_success_msg $*
+-    }
+-    failure () {
+-        log_failure_msg $*
+-    }
+-else
+-    success () {
+-        echo $*
+-    }
+-    failure () {
+-        echo $*
+-    }
+-fi
+ 
+ start() {
+ 	local r
+-	echo -n $"Starting domain watchdog daemon: "
++	stat_busy "Starting domain watchdog daemon"
+ 
+ 	$DAEMON 30 15
+ 	r=$?
+-	[ "$r" -eq 0 ] && success $"$base startup" || failure $"$base startup"
+-	echo
++	[ "$r" -eq 0 ] && stat_done ; add_daemon $initname || stat_fail
+ 
+ 	return $r
+ }
+ 
+ stop() {
+ 	local r
+-	echo -n $"Stopping domain watchdog daemon: "
++	stat_busy "Stopping domain watchdog daemon"
+ 
+ 	killall -USR1 $base 2>/dev/null
+ 	r=$?
+-	[ "$r" -eq 0 ] && success $"$base stop" || failure $"$base stop"
+-	echo
++	[ "$r" -eq 0 ] && stat_done ; rm_daemon $initname || stat_fail
+ 
+ 	return $r
+ }
diff --git a/kernels/xen/proc-xen.mount b/kernels/xen/proc-xen.mount
new file mode 100644
index 000000000..0eaa59c5f
--- /dev/null
+++ b/kernels/xen/proc-xen.mount
@@ -0,0 +1,9 @@
+[Unit]
+Description=Mount /proc/xen files
+ConditionPathExists=/proc/xen
+RefuseManualStop=true
+
+[Mount]
+What=xenfs
+Where=/proc/xen
+Type=xenfs
diff --git a/kernels/xen/texi2html.patch b/kernels/xen/texi2html.patch
new file mode 100644
index 000000000..8f22773c9
--- /dev/null
+++ b/kernels/xen/texi2html.patch
@@ -0,0 +1,10 @@
+--- a/tools/Makefile	2012-09-17 22:25:54.683349679 -0500
++++ b/tools/Makefile	2012-09-17 22:49:08.923331802 -0500
+@@ -164,6 +164,7 @@
+ 		$(QEMU_ROOT)/xen-setup \
+ 		--extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \
+ 		$(IOEMU_CONFIGURE_CROSS); \
++		sed -i 's/number[ ]/number-sections /' Makefile; \
+ 		$(MAKE) install
+ 
+ subdir-clean-qemu-xen-traditional-dir:
diff --git a/kernels/xen/var-lib-xenstored.mount b/kernels/xen/var-lib-xenstored.mount
new file mode 100644
index 000000000..1c2015ca2
--- /dev/null
+++ b/kernels/xen/var-lib-xenstored.mount
@@ -0,0 +1,10 @@
+[Unit]
+Description=mount xenstore file system
+ConditionPathExists=/proc/xen
+RefuseManualStop=true
+
+[Mount]
+What=xenstore
+Where=/var/lib/xenstored
+Type=tmpfs
+Options=mode=755
diff --git a/kernels/xen/xen.conf b/kernels/xen/xen.conf
new file mode 100644
index 000000000..37a5b59f7
--- /dev/null
+++ b/kernels/xen/xen.conf
@@ -0,0 +1,19 @@
+xen-evtchn
+xen-gntdev
+xen-gntalloc
+xen-blkback
+xen-netback
+xen-pciback
+xen-acpi-processor
+## xen-acpi-processor: This module may not work on all machines; try removing this first if it causes issues.
+
+## The following were included in xencommons, but were not inserted by systemd:
+# evtchn
+# gntdev
+# netbk
+# blkbk
+# xen-scsibk
+# usbbk
+# pciback
+# blktap2
+# blktap
diff --git a/kernels/xen/xen.install b/kernels/xen/xen.install
new file mode 100644
index 000000000..5664948c7
--- /dev/null
+++ b/kernels/xen/xen.install
@@ -0,0 +1,38 @@
+install_msg() {
+    cat << __EOF__
+===> IMPORTANT NOTICE:
+
+In order to complete the installation, and enable Xen,
+at the very least you must:
+1. Edit your GRUB2 config files as specified at
+    https://wiki.archlinux.org/index.php/Xen#Bootloader_Configuration
+2. Issue the following commands to allow you to create and start VMs:
+    systemctl enable xenstored.service
+    systemctl enable xenconsoled.service
+    systemctl enable xendomains.service
+For more information refer to the Wiki:
+    https://wiki.archlinux.org/index.php/Xen
+__EOF__
+
+}
+
+post_upgrade() {
+    install_msg
+}
+
+pre_remove() {
+    for i in xen{stored,consoled,domains}.service; do
+        systemctl disable $serv
+        systemctl stop $serv
+    done
+}
+
+post_remove() {
+    cat << __EOF__
+===> IMPORTANT NOTICE:
+
+In order to finish removing Xen, you will need to modify
+your bootloader configuration files to load your Linux
+kernel instead of Xen kernel.
+__EOF__
+}
diff --git a/kernels/xen/xenconsoled.service b/kernels/xen/xenconsoled.service
new file mode 100644
index 000000000..edcc8e69f
--- /dev/null
+++ b/kernels/xen/xenconsoled.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Xenconsoled - handles logging from guest consoles and hypervisor
+Requires=proc-xen.mount
+After=proc-xen.mount xenstored.service
+ConditionPathExists=/proc/xen
+
+[Service]
+Type=simple
+Environment=XENCONSOLED_ARGS=
+Environment=XENCONSOLED_LOG=none
+Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console
+EnvironmentFile=-/etc/conf.d/xenconsoled
+PIDFile=/var/run/xenconsoled.pid
+ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
+ExecStart=/usr/sbin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kernels/xen/xendomU@.service b/kernels/xen/xendomU@.service
new file mode 100644
index 000000000..57d6e520d
--- /dev/null
+++ b/kernels/xen/xendomU@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=xen domU service for domain %i
+Requires=xenstored.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/xl create /etc/xen/conf/%i.cfg
+ExecStop=/usr/sbin/xl shutdown %i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kernels/xen/xendomains.service b/kernels/xen/xendomains.service
new file mode 100644
index 000000000..d49bd5593
--- /dev/null
+++ b/kernels/xen/xendomains.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Xendomains - start and stop guests on boot and shutdown
+Requires=proc-xen.mount xenstored.service
+After=proc-xen.mount xenstored.service xenconsoled.service
+ConditionPathExists=/proc/xen
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
+ExecStart=/etc/xen/scripts/xendomains start
+ExecStop=/etc/xen/scripts/xendomains stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/kernels/xen/xenstored.service b/kernels/xen/xenstored.service
new file mode 100644
index 000000000..9025f2244
--- /dev/null
+++ b/kernels/xen/xenstored.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Xenstored - daemon managing xenstore file system
+Requires=proc-xen.mount var-lib-xenstored.mount
+After=proc-xen.mount var-lib-xenstored.mount
+Before=libvirtd.service libvirt-guests.service
+RefuseManualStop=true
+ConditionPathExists=/proc/xen
+
+[Service]
+Type=forking
+Environment=XENSTORED_ARGS=
+EnvironmentFile=-/etc/conf.d/xenstored
+PIDFile=/var/run/xenstored.pid
+ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
+ExecStart=/usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 396706459..2360945ee 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -17,7 +17,7 @@ else
 fi
 pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
 pkgver=2.64a
-pkgrel=3
+pkgrel=4
 pkgaev=5
 arch=(
   i686
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index c0a063e95..7c231fe27 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=clementine
 pkgname=clementine-libre
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -26,7 +26,7 @@ conflicts=('clementine')
 provides=("clementine=$pkgver")
 source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
         remove-and-disable-spotify.patch)
-sha1sums=('af446aba5ca89edd1541871969b3b6738ffbd05f'
+sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e'
           '3980a00c02e406226f0d08ae9b7e581702c89838')
 install=clementine.install
 
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 461cc23e2..583b679ca 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=35421
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index edb193560..c5b33cf75 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=mplayer-vaapi-libre
 pkgver=35107
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A movie player, compiled with vaapi (without unfree faac support)"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD
index 67ce115bb..1e5634fb6 100644
--- a/pcr/ffmpeg-static/PKGBUILD
+++ b/pcr/ffmpeg-static/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=ffmpeg-static
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
 arch=(i686 x86_64 mips64el)
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
new file mode 100644
index 000000000..6da6f14bd
--- /dev/null
+++ b/pcr/libav/PKGBUILD
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+static=false
+pkgbase=libav
+if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
+  pkgname=libav-static
+  pkgflag=-static
+  staticdesc=', with static library'
+elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
+  pkgname=libav
+fi
+pkgver=0.8.4
+pkgrel=3
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url="http://$pkgbase.org/"
+license=(
+  GPL
+)
+depends=(
+  alsa-lib
+  bzip2
+  gsm
+  lame
+  libpulse
+  libtheora
+  libva
+  libvorbis
+  libvpx
+  opencore-amr
+  openjpeg
+  rtmpdump
+  schroedinger
+  sdl
+  speex
+  x264
+  xvidcore
+  zlib
+)
+makedepends=(
+  yasm
+  libvdpau
+)
+source=(
+  http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
+)
+sha512sums=(
+  d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610
+)
+
+build() {
+  cd $pkgbase-$pkgver
+
+  ./configure \
+    --prefix=/opt/$pkgname \
+    --enable-libmp3lame \
+    --enable-libvorbis \
+    --enable-libxvid \
+    --enable-libx264 \
+    --enable-libvpx \
+    --enable-libtheora \
+    --enable-libgsm \
+    --enable-libspeex \
+    --enable-postproc \
+    --enable-shared \
+    --enable-x11grab \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libschroedinger \
+    --enable-libopenjpeg \
+    --enable-librtmp \
+    --enable-libpulse \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-runtime-cpudetect \
+    --disable-debug \
+    --enable-static
+
+  make
+  make tools/qt-faststart
+  make doc/ffmpeg.1
+  make doc/av{play,server}.1
+}
+
+package() {
+  cd $pkgbase-$pkgver
+  make DESTDIR=$pkgdir install install-man
+  install -m755 -d                              $pkgdir/etc/ld.so.conf.d
+  install -m755 -d                              $pkgdir/usr/bin
+  install -m755 -d                              $pkgdir/usr/share/man/man1
+  install -Dm755 tools/qt-faststart             $pkgdir/opt/$pkgname/bin
+  ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
+  ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
+  ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
+  ln -s /opt/$pkgname/bin/avserver              $pkgdir/usr/bin/avserver$pkgflag
+  ln -s /opt/$pkgname/bin/ffmpeg                $pkgdir/usr/bin/ffmpeg-$pkgname
+  ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
+  ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1
+  ln -s /opt/$pkgname/share/man/man1/ffmpeg.1   $pkgdir/usr/share/man/man1/ffmpeg-$pkgname.1
+  echo /opt/libav$pkgflag/lib                  > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
+}
+
+# vim:set ts=2 sw=2 et: