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

Conflicts:
	community/emesene/PKGBUILD
	community/minidlna/PKGBUILD
	community/uzbl/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/lirc/PKGBUILD
	libre/pacman/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	testing/mesa/PKGBUILD
	testing/subversion/PKGBUILD

26 files changed, 347 insertions, 106 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 5ad10d94b..14ae58ba1 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48634 2011-06-03 16:47:30Z stephane $
+# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.3
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('aee05cac444f68491f2a3d68b22da53e'
+md5sums=('b6b07a35afe4dbf188f42e932536cca3'
          'f4b80e3b34e34bce68b3f052ff52dee8')
 
 build() {
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index c7b5ef441..090fdea53 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 44605 2011-04-09 12:36:14Z svenstaro $
+# $Id: PKGBUILD 49101 2011-06-11 03:15:22Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
-pkgver=2.2.8
+pkgver=2.2.9
 pkgrel=1
 pkgdesc="A multi-platform game development library."
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu'
 makedepends=('doxygen' 'graphviz')
 options=('!libtool')
 source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
-md5sums=('b4184ea1535bbda52c2eea7523f332e4')
+md5sums=('321886420efa0263e6f6273057b5d6df')
 
 build() { 
 	cd ${srcdir}/ClanLib-${pkgver}
diff --git a/community/compizconfig-backend-kconfig4/PKGBUILD b/community/compizconfig-backend-kconfig4/PKGBUILD
new file mode 100644
index 000000000..7722987dc
--- /dev/null
+++ b/community/compizconfig-backend-kconfig4/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 49088 2011-06-10 14:35:09Z andrea $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=compizconfig-backend-kconfig4
+pkgver=0.8.4
+pkgrel=1
+pkgdesc="Compizconfig backend for kconfig4"
+arch=('i686' 'x86_64')
+url="http://www.compiz.org/"
+license=('GPL2')
+depends=('libcompizconfig' 'kdelibs' 'libxcomposite' 'libxinerama')
+makedepends=('cmake' 'automoc4')
+groups=('compiz-fusion-kde' 'compiz-fusion')
+source=("http://releases.compiz.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('89f3cdbdbb8b1bc88f55ccaedbc8404d')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index 606f2f751..929b7f13c 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 32607 2010-11-15 15:15:59Z spupykin $
+# $Id: PKGBUILD 49059 2011-06-10 08:42:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 
 pkgname=dia
 pkgver=0.97.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A GTK+ based diagram creation program"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,30 +14,32 @@ install=dia.install
 depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2')
 makedepends=('intltool' 'python2' 'docbook-xsl')
 optdepends=('python2')
-options=('!libtool')
+options=('!libtool' 'docs')
 source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.bz2"
 	"dia-overflow-fix.patch")
 md5sums=('57e44bb9f387559a0506b52a134deaf0'
          '8fd9a2ad35b5a6fd8c758d7c73dbfe66')
-md5sums=('57e44bb9f387559a0506b52a134deaf0'
-         '8fd9a2ad35b5a6fd8c758d7c73dbfe66')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export PYTHON=/usr/bin/python2
   sed -i 's#python2\.1#python2 python2.1#' configure
-  patch -p1 <$srcdir/dia-overflow-fix.patch
+  patch -p1 <$srcdir/dia-overflow-fix.patch || true
 
   ./configure --prefix=/usr \
-    --enable-db2html \
     --with-cairo \
     --with-python \
-    --disable-gnome
+    --disable-gnome \
+    --with-hardbooks
+  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
   make
+  cd doc && make html
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  cd doc && make DESTDIR="${pkgdir}" install-html
+  ln -sf ../doc/dia/html $pkgdir/usr/share/dia/help
 }
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index 6596f7e0c..469adf4b8 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -2,47 +2,57 @@
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
 pkgname=emesene
-pkgver=1.6.3
-pkgrel=4
+pkgver=2.11.5
+pkgrel=1
 pkgdesc="A pygtk MSN Messenger client"
 url="http://www.emesene.org/"
 license=('custom:PSF' 'GPL' 'LGPL2.1')
-arch=('i686' 'x86_64' 'mips64el') # libmimic is hardcoded, so no 'any' package
-depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils')
+arch=('i686' 'x86_64') # libmimic is hardcoded, so no 'any' package
+#depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils')
+depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \
+'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme')
+makedepends=('python2-distribute')
 optdepends=('gnome-python-extras: spell-check plugin'
 	'gtkspell: spell-check plugin'
 	'aspell: spell-check plugin (also need aspell dictionary)'
 	'gstreamer0.10-python: webcam support'
-	'gstreamer0.10-good-plugins: webcam support')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-$pkgver.tar.gz \
-	'emesene.run' 'setup.patch')
+	'gstreamer0.10-good-plugins: webcam support'
+	'pywebkitgtk: for alternative conversation window' 
+        'xmpppy: for gtalk and facebook chat support'
+	'pyqt: alternative qt4 interface (emesene -e main:qt4_main')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" \
+	'emesene.run')
 install=emesene.install
 options=('!libtool')
-sha1sums=('c4759efe180c8e1589bd966c6b84106aa7cd356e'
-          '46dcc89d089c0356d121356aa2ffff45e4468138'
-          '0195898a6cb609f4ad736e0687bf76641f6db537')
+sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691'
+          '2d72b485875803d4675d1e1b36c90778e4475651')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' Controller.py
-
-  # enable installing in setup.py
-  patch -Np0 -i ${srcdir}/setup.patch
-
-  # install license files
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/emesene/COPYING
-  install -Dm644 PSF ${pkgdir}/usr/share/licenses/emesene/PSF
+  # do not import dummy session
+  #  sed -i -e  "/import dummy/d" emesene/emesene.py
 
   # install files
+  export PYTHONPATH="${pkgdir}/usr/lib/python2.7/site-packages/"
+  install -d ${pkgdir}/usr/lib/python2.7/site-packages/
   python2 setup.py install --prefix=${pkgdir}/usr
+}
+
+package() {
+  cd ${pkgdir}
 
   # use /usr/share/emesene instead of /usr/lib/python2.5/site-packages
-  mv -f ${pkgdir}/usr/lib/python2.7/site-packages $pkgdir/usr/share/emesene
+  mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-2.0-py2.7.egg/share \
+        ${pkgdir}/usr
+  mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-2.0-py2.7.egg/emesene \
+        ${pkgdir}/usr/share
   rm -rf ${pkgdir}/usr/lib
 
-  # remove old executable and use our own because we use /usr/share/emesene
-  rm ${pkgdir}/usr/bin/emesene
+  # python -> python2 
+  find -name *.py -exec sed -i "s|/usr/bin/env python|/usr/bin/env python2|" {} \;
+
+  # create executable
   install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene
 }
+
diff --git a/community/emesene/emesene.install b/community/emesene/emesene.install
index 309ea10a5..9ff2df7f8 100644
--- a/community/emesene/emesene.install
+++ b/community/emesene/emesene.install
@@ -1,5 +1,6 @@
 post_install() {
-        xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run
index 35d9dbfa3..3b0aacdf9 100644
--- a/community/emesene/emesene.run
+++ b/community/emesene/emesene.run
@@ -1,3 +1,3 @@
 #!/bin/bash
-python2 /usr/share/emesene/Controller.py $@
+python2 /usr/share/emesene/emesene.py $@
 
diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD
index ac41f1b86..6a7b3359d 100644
--- a/community/fityk/PKGBUILD
+++ b/community/fityk/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Cuneyt Unlu <unlucu AT gmail.com>
 
 pkgname=fityk
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc='A program for nonlinear fitting of analytical functions to data.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,11 @@ depends=('boost-libs' 'xylib' 'wxgtk' 'shared-mime-info')
 makedepends=('boost' 'git' 'python-sphinx')
 options=('!libtool')
 install=${pkgname}.install
-source=('http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.9.1.tar.bz2')
-md5sums=('81c20d7b2ba31becb18e467dbe09be8f')
+source=('http://biolpc22.york.ac.uk/pub/Daily_HEAD/wxWidgets.tar.gz') # daily snapshot because fityk requires a version that hasn't been released yet...
+md5sums=('71a465a1d60c33c33b644d15ba23f30b')
 
 build() {
-  cd wxWidgets-2.9.1
+  cd wxWidgets
   ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
   make
   make install
@@ -25,7 +25,7 @@ build() {
   cd ${srcdir}
   git clone git://github.com/wojdyr/fityk.git
   cd fityk
-  ##git checkout v${pkgver}
+  git checkout v${pkgver}
   #cd ${pkgname}-${pkgver}
 
   # disable xyconvert because wxwidgets>=2.9 is needed (dev version) and it isn't standard with arch yet
diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD
index 52e81f6ad..163af76af 100644
--- a/community/gogglesmm/PKGBUILD
+++ b/community/gogglesmm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 41060 2011-03-03 15:30:41Z spupykin $
+# $Id: PKGBUILD 49064 2011-06-10 08:43:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sander Jansen <sander@knology.net>
 
 pkgname=gogglesmm
-pkgver=0.12.1
+pkgver=0.12.2
 pkgrel=1
 pkgdesc="Music Manager and Player"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,12 +14,16 @@ depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'cur
 replaces=('musicmanager')
 conflicts=('musicmanager')
 source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2)
-md5sums=('8657be2f67b25837fcf5d442700619aa')
+md5sums=('2fc5c90dc3feeacd857913c48c65771c')
 
 build() {
   cd $srcdir/gogglesmm-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/gogglesmm-$pkgver
   mkdir -p $pkgdir/usr/bin
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index 5bb7c7c5d..4dbce4da6 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -1,20 +1,25 @@
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=gsmartcontrol
-pkgver=0.8.5
+pkgver=0.8.6
 pkgrel=1
 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
 license=('GPL3')
-depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm')
+depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2')
 install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/$pkgname-$pkgver.tar.bz2)
-md5sums=('654ee0b77665206d4d8a46080c5747b6')
+source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('d2ac685e2e73b05f7ba74c93623af739')
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
+	cd ${srcdir}/${pkgname}-${pkgver}
 	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR=$pkgdir install
+	make 
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	make DESTDIR=${pkgdir} install
 }
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 9e6ca62de..18cba3694 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 43934 2011-03-31 20:13:41Z spupykin $
+# $Id: PKGBUILD 49069 2011-06-10 08:44:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
 # Contributor: Matthias Sobczyk <matthias.sobczyk@googlemail.com>
 
 pkgname=minidlna
-pkgver=1.0.19
-pkgrel=2
+pkgver=1.0.20
+pkgrel=1
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://minidlna.sourceforge.net"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/minidlna/"
 license=('GPL')
 depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite3')
 conflicts=('minidlna-cvs')
 backup=('etc/minidlna.conf')
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
         minidlna.rc)
-md5sums=('8bb5f2c0abc009e16039d7deecf09cf6'
+md5sums=('1c5230cc6dec7592eca4c63c526eadb7'
          '80c423f003894ad15d7de41f3ed342c0')
 
 build() {
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD
index b7051c892..60fc8c24f 100644
--- a/community/mldonkey/PKGBUILD
+++ b/community/mldonkey/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 40262 2011-02-22 17:18:28Z cbrannon $
+# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
 
 pkgname=mldonkey
 pkgver=3.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-network P2P client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mldonkey.sourceforge.net/"
@@ -17,11 +17,16 @@ optdepends=('librsvg: GUI support'
 backup=('etc/conf.d/mldonkey')
 install=mldonkey.install
 source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
-        mldonkeyd mldonkey.conf mldonkey.desktop)
+        mldonkey-gcc46.patch
+        mldonkeyd
+        mldonkey.conf
+        mldonkey.desktop)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Patch comes from upstream; will go away in later versions.
+  patch -p1 < "$srcdir/mldonkey-gcc46.patch"
   ./configure --prefix=/usr --enable-gui=newgui2
   make
 }
@@ -39,6 +44,7 @@ package() {
   install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey"
 }
 md5sums=('162b78fc4e20335a8fe31d91e1656db2'
-         'c42526cb7ff703b313728dfdd92dfb1e'
-         '190cbbc30b510981e0d8b0ed8bae87a4'
+         'c2bd99420ba5d48629b6823aae6bf127'
+         '75e4b6c7fb282f7de15a8d5478f3bd70'
+         '1f86d92db51c62cded0e6f3833057dee'
          '1de3266caa49f82bee73ba891eea12cf')
diff --git a/community/mldonkey/mldonkey-gcc46.patch b/community/mldonkey/mldonkey-gcc46.patch
new file mode 100644
index 000000000..656d72f85
--- /dev/null
+++ b/community/mldonkey/mldonkey-gcc46.patch
@@ -0,0 +1,12 @@
+diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
+index 775a898..af1621b 100644
+--- a/src/utils/lib/CryptoPP.h
++++ b/src/utils/lib/CryptoPP.h
+@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs
+ {
+ public:
+ 	bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;}
++	NullNameValuePairs() {}
+ };
+ 
+ //! _
diff --git a/community/mldonkey/mldonkey.conf b/community/mldonkey/mldonkey.conf
index 7aa683f1a..24a25af74 100644
--- a/community/mldonkey/mldonkey.conf
+++ b/community/mldonkey/mldonkey.conf
@@ -3,6 +3,3 @@ MLDUSER=""
 
 # Parameters to be passed to the daemon (default is empty)
 PARAMS=""
-
-# PID file location (defaults to "/var/lock" if empty)
-PIDDIR=""
diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd
index bbd6954c2..6a458d68e 100644
--- a/community/mldonkey/mldonkeyd
+++ b/community/mldonkey/mldonkeyd
@@ -9,6 +9,15 @@ if [ -z $MLDUSER ] ; then
 	exit 2
 fi
 
+if [ -z "$(getent passwd "$MLDUSER")" ]; then
+	# Perhaps we should create the account for the user?
+	echo "You must create the account $MLDUSER in order to run mldonkey."
+	echo "Please create the account manually, and try again."
+	exit 2
+fi
+
+MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4)
+MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1)
 USERDIR=$(getent passwd $MLDUSER | cut -d: -f6)
 
 if [ ! -d $USERDIR ]; then
@@ -16,12 +25,20 @@ if [ ! -d $USERDIR ]; then
 	exit 2
 fi
 
-PID=$(cat $USERDIR/.mldonkey/mlnet.pid 2>/dev/null)
+PIDDIR="/var/run/mldonkey"
+PIDFILE="$PIDDIR/mlnet.pid"
+PID=$(cat $PIDFILE 2>/dev/null)
 
 case "$1" in
     	start)
         	stat_busy "Starting MLDonkey"
-		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
+		if [ ! -d $PIDDIR ]; then
+			install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR
+		fi
+		if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then
+			chown -R "$MLDUSER:$MLDGROUP" $PIDDIR
+		fi
+		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR  $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 6e6677aaa..a9e4c3305 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44312 2011-04-05 15:06:23Z spupykin $
+# $Id: PKGBUILD 49143 2011-06-11 22:40:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.03.28
-_pkgsubver=387002
+pkgver=2011.05.27
+_pkgsubver=420096
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,13 @@ license=('GPL')
 makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers')
 depends=("kernel26")
 install=$pkgname.install
-source=(http://easynews.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz)
-md5sums=('a9c72ab0b8f7778d444e69e9d3b95527')
+source=(http://kent.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz)
+md5sums=('3e43d4857d412d02115e69db193830b5')
 
 build() {
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
   sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
+  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x
   (cd modules && make modules)
 }
 
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index ac1c1d47d..d20c69e85 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48659 2011-06-03 19:34:11Z stephane $
+# $Id: PKGBUILD 49148 2011-06-11 22:48:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.03.28
-_pkgsubver=387002
-pkgrel=4
+pkgver=2011.05.27
+_pkgsubver=420096
+pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
@@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('a9c72ab0b8f7778d444e69e9d3b95527'
+md5sums=('3e43d4857d412d02115e69db193830b5'
          '06f7448e274db2a911f582e276088fc9'
          'b183ec265200d68431a5e4eb1b0c8cf5'
          '8c333a979578bdc0c3134c1dd6bb7353'
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index c9a69465b..56d4472ae 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 46398 2011-05-07 07:41:07Z ttopper $
+# $Id: PKGBUILD 49091 2011-06-10 19:39:21Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor:  JerichoKru   <jerichokru(AT)htomail.com>
 
 pkgname=pragha
-pkgver=0.95.0.1
+pkgver=0.96.1
 pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification')
 replaces=('dissonance')
 install=pragha.install
 source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('4ad9de34e2e78176494d62b5407c3cbbbfb9c183')
+sha1sums=('0782f552cdf786290ab9b4defd1d65869c5ff08f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 06b82a406..3a76900e5 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
-pkgver=2.8.0
+pkgver=2.8.1
 pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('python2: needed for search'
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz"
         'python2.patch')
-md5sums=('6337b679b40f56fdd2dd49d795fd5405'
+md5sums=('4fb4490117a0909f1f0989b4b797b41a'
          'db0d79fee8ce3470ad3741d36b02a94c')
 
 build() {
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 9be9c6f15..e89ad91c5 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 48519 2011-06-01 11:08:54Z stativ $
+# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=3.1m5
+pkgver=3.1m6
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
 license=('GPL')
-depends=('bzip2' 'libsigc++' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils')
+depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
 source=(rawtherapee.desktop rawtherapee.png)
@@ -47,7 +47,6 @@ build() {
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_MYFILE_MMAP=OFF \
      ../$_repo
   make
 }
diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD
index 11e8a3b63..42cfc5ea3 100644
--- a/community/uzbl/PKGBUILD
+++ b/community/uzbl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45245 2011-04-18 20:59:54Z lcarlier $
+# $Id: PKGBUILD 49179 2011-06-12 21:24:14Z jelle $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
@@ -6,8 +6,8 @@
 pkgbase=uzbl
 pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
 pkgver=2011.04.12
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=3
+arch=('i686' 'x86_64')
 url="http://www.uzbl.org"
 license=('GPL3')
 makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13')
@@ -23,7 +23,7 @@ build() {
     done
     sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
            -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-           $(find ./ -name '*.py')
+           $(find ./ -name '*.py') bin/*
 
     make
 }
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 965ee69e9..509ff2db3 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 44936 2011-04-13 05:20:34Z schiv $
+# $Id: PKGBUILD 48166 2011-05-29 11:57:10Z mherych $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=vhba-module
 pkgver=20100822
-_kernver='2.6.38-ARCH'
-pkgrel=4
+_kernver='2.6.39-ARCH'
+pkgrel=5
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.38' 'kernel26<2.6.39')
-makedepends=('kernel26-headers>=2.6.38' 'git')
+depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
+makedepends=('kernel26-headers>=2.6.39' 'git')
 install=vhba-module.install
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz
         vhba-kernel2.6.37.patch)
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index ee557ebee..f8331eaea 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $
+# $Id: PKGBUILD 49114 2011-06-11 08:28:49Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
 pkgver=4.0.8
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -16,7 +16,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
         18-system-xorg.patch
-_kernver=2.6.38-LIBRE
+        change_default_driver_dir.patch)
+_kernver=2.6.39-LIBRE
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -178,7 +179,7 @@ package_virtualbox-guest-modules(){
     pkgdesc="VirtualBox kernel modules for Linux guests"
     license=('GPL')
     install=virtualbox-guest-modules.install
-    depends=('kernel26>=2.6.38' 'kernel26<2.6.39')
+    depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
     replaces=('virtualbox-ose-additions-modules')
     conflicts=('virtualbox-ose-additions-modules')
 
diff --git a/community/virtualbox/virtualbox-guest-modules.install b/community/virtualbox/virtualbox-guest-modules.install
index 3681c28e3..ae05bd1ba 100644
--- a/community/virtualbox/virtualbox-guest-modules.install
+++ b/community/virtualbox/virtualbox-guest-modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION='2.6.38-ARCH'
+KERNEL_VERSION='2.6.39-ARCH'
 
 post_install() {
   cat << EOM
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
new file mode 100644
index 000000000..b71a1557d
--- /dev/null
+++ b/community/wine/PKGBUILD
@@ -0,0 +1,145 @@
+# $Id: PKGBUILD 49102 2011-06-11 03:15:30Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=wine
+pkgver=1.3.22
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
+md5sums=('46f313013644d31ad37b8fc5c2c16467')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+depends=(
+  fontconfig      lib32-fontconfig
+  mesa            lib32-mesa 
+  libxcursor      lib32-libxcursor
+  libxrandr       lib32-libxrandr
+  libxdamage      lib32-libxdamage
+  libxxf86dga     lib32-libxxf86dga
+  libxi           lib32-libxi
+  alsa-lib        lib32-alsa-lib
+  desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
+  giflib          lib32-giflib
+  libxpm          lib32-libxpm
+  libpng          lib32-libpng
+  libxinerama     lib32-libxinerama
+  libxcomposite   lib32-libxcomposite
+  libxmu          lib32-libxmu
+  libxxf86vm      lib32-libxxf86vm
+  libxml2         lib32-libxml2
+  libxslt         lib32-libxslt
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
+  v4l-utils       lib32-v4l-utils
+  oss
+)
+  
+optdepends=(
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  libxml2         lib32-libxml2
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
+  v4l-utils       lib32-v4l-utils
+  oss
+)
+
+if [[ $CARCH == i686 ]]; then
+  # Strip lib32 etc. on i686
+  depends=(${depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
+  optdepends=(${optdepends[@]/*32-*/})
+else
+  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+  conflicts=('bin32-wine' 'wine-wow64')
+  replaces=('bin32-wine')
+fi
+
+build() {
+  cd "$srcdir"
+
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
+
+  if [[ $CARCH == x86_64 ]]; then
+    msg2 "Building Wine-64..."
+
+    mkdir $pkgname-64-build
+    cd "$srcdir/$pkgname-64-build"
+    ../$pkgname/configure \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+      --libdir=/usr/lib \
+      --with-x \
+      --enable-win64
+
+    make
+
+    _wine32opts=(
+      --libdir=/usr/lib32
+      --with-wine64="$srcdir/$pkgname-64-build"
+    )
+
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  fi
+
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-x \
+    "${_wine32opts[@]}"
+
+  make
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+
+  if [[ $CARCH == i686 ]]; then
+    make prefix="$pkgdir/usr" install
+  else
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib32" \
+      dlldir="$pkgdir/usr/lib32/wine" install
+
+    msg2 "Packaging Wine-64..."
+    cd "$srcdir/$pkgname-64-build"
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib" \
+      dlldir="$pkgdir/usr/lib/wine" install
+  fi
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
new file mode 100644
index 000000000..f71262186
--- /dev/null
+++ b/community/wine/wine.install
@@ -0,0 +1,12 @@
+post_install() {
+	update-desktop-database -q
+	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+	echo "If you are on x86_64, the default WINEARCH will be win64."
+	echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+	echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+	echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+	update-desktop-database -q
+}