Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/buoh/PKGBUILD
	core/openssl/PKGBUILD
	extra/llvm/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/pygobject2/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/consolekit/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/lirc/PKGBUILD
	testing/samba/PKGBUILD
	testing/systemd/PKGBUILD

17 files changed, 86 insertions, 50 deletions

diff --git a/community/buoh/PKGBUILD b/community/buoh/PKGBUILD
index 8819f2589..4691dd908 100644
--- a/community/buoh/PKGBUILD
+++ b/community/buoh/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 66594 2012-02-26 13:42:22Z lfleischer $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 70031 2012-04-28 12:10:05Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=buoh
 pkgver=0.8.2
-pkgrel=5
-pkgdesc="A reader for online strips comics"
+pkgrel=6
+pkgdesc="Reader for online strips comics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://buoh.steve-o.org/"
 license=('GPL')
-depends=('libgnomeui' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
-makedepends=('gettext' 'intltool' 'pkgconfig')
+depends=('gtk2' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
+makedepends=('intltool')
+options=('!emptydirs')
 install=buoh.install
-source=("http://buoh.steve-o.org/downloads/${pkgname}-${pkgver}.tar.bz2"
+source=("http://buoh.steve-o.org/downloads/$pkgname-$pkgver.tar.bz2"
         buoh-libsoup24.patch)
 md5sums=('50474a8712ad20ab36d8f8058a4647fb'
          'c44f0e1828492a5d7d8efee764558fb4')
@@ -20,16 +22,19 @@ sha1sums=('29d702b485a901868f65116e753cb515b3e2a2c5'
           '012badf13e33818268b744e106bdcccfd8fc66ed')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   patch -p1 < ../buoh-libsoup24.patch
   autoconf
 
-  ./configure --prefix=/usr --sysconfdir=/usr/share --disable-schemas-install
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas --without-libgnomeui
   make AM_CFLAGS=-lxml2
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/buoh/buoh.install b/community/buoh/buoh.install
index 2c1fcdf8a..44175ce06 100644
--- a/community/buoh/buoh.install
+++ b/community/buoh/buoh.install
@@ -2,7 +2,6 @@ pkgname=buoh
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }
 
@@ -19,6 +18,5 @@ pre_remove() {
 }
 
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 6110b2aea..815214d2f 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64323 2012-02-11 23:21:03Z allan $
+# $Id: PKGBUILD 70011 2012-04-28 09:24:04Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
 pkgver=4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freemat.sourceforge.net"
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index c43b314b8..53693e857 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69004 2012-04-07 16:55:48Z lcarlier $
+# $Id: PKGBUILD 70013 2012-04-28 09:24:06Z allan $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index ceb786751..3e0e8e0b2 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69722 2012-04-23 07:27:51Z lcarlier $
+# $Id: PKGBUILD 70015 2012-04-28 09:24:08Z allan $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 8432fa488..b978e43b1 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69728 2012-04-23 09:06:52Z ibiru $
+# $Id: PKGBUILD 70017 2012-04-28 09:24:10Z allan $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=gedit-plugins
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for gedit"
 arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 826a5cc2f..446334bb4 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68862 2012-04-04 09:31:15Z allan $
+# $Id: PKGBUILD 70019 2012-04-28 09:24:11Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-base
 pkgver=1.24.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 5b612932f..e0899ca41 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69738 2012-04-23 09:07:48Z ibiru $
+# $Id: PKGBUILD 70021 2012-04-28 09:24:13Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
 pkgver=2.91.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gtranslator/"
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index d49693998..4da593be4 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69280 2012-04-12 09:17:37Z foutrelis $
+# $Id: PKGBUILD 70077 2012-04-29 03:10:00Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent')
 makedepends=('perl')
 options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha256sums=('1403b24fe8d32a8e5ae4c39aadb8ad9c72f17b2a3244943eb0d8fc4821f02c70')
+sha256sums=('3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD
index 151440742..8390f87de 100644
--- a/community/librep/PKGBUILD
+++ b/community/librep/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68538 2012-03-27 07:09:16Z arodseth $
+# $Id: PKGBUILD 70025 2012-04-28 09:24:16Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: stefan-husmann@t-online.de
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=librep
 pkgver=0.92.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Lisp system for Sawfish"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 909f7daf3..e26e18a67 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69768 2012-04-23 09:16:14Z ibiru $
+# $Id: PKGBUILD 70027 2012-04-28 09:24:17Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=4.2.0
-#_rel=stable
-_rel=devel
+pkgver=4.3.0
+_rel=stable
+#_rel=devel
 pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686' 'mips64el')
@@ -14,9 +14,9 @@ license=('GPL')
 depends=('icu' 'openssl' 'libffi')
 makedepends=('perl-json')
 optdepends=('freeglut')
-options=(!makeflags)
-source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4')
+options=('!makeflags')
+source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
+sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 9feb1be34..2646dbf7f 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62594 2012-01-22 09:34:17Z bisson $
+# $Id: PKGBUILD 70039 2012-04-28 15:51:53Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
 pkgver=0.16
-pkgrel=4
+pkgrel=5
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
@@ -13,13 +13,16 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
 optdepends=('libdiscid: CD lookup'
             'chromaprint: fingerprinting')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('274071410550ee29051bb0137d72602921a015f9')
+source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'typeheader.patch')
+sha1sums=('274071410550ee29051bb0137d72602921a015f9'
+          '0bd871632c28ef656af7ae89a8e752120f2cd7bd')
 
 install=install
 
 build() {
 	cd "${srcdir}/picard-${pkgver}"
+	patch -p1 -i ../typeheader.patch
 	python2 setup.py config
 }
 
diff --git a/community/picard/typeheader.patch b/community/picard/typeheader.patch
new file mode 100644
index 000000000..b34852673
--- /dev/null
+++ b/community/picard/typeheader.patch
@@ -0,0 +1,25 @@
+diff -Naur old/picard/webservice.py new/picard/webservice.py
+--- old/picard/webservice.py	2011-10-23 19:15:29.000000000 +0200
++++ new/picard/webservice.py	2012-04-28 17:43:17.562422696 +0200
+@@ -149,8 +149,11 @@
+             url.setPassword(self.config.setting["password"])
+         request = QtNetwork.QNetworkRequest(url)
+         request.setRawHeader("User-Agent", "MusicBrainz-Picard/%s" % version_string)
+-        if method == "POST" and host == self.config.setting["server_host"]:
+-            request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
++        if data is not None:
++            if method == "POST" and host == self.config.setting["server_host"]:
++                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
++            else:
++                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded")
+         send = self._request_methods[method]
+         reply = send(request, data) if data is not None else send(request)
+         key = (host, port)
+@@ -370,6 +373,7 @@
+     def _encode_acoustid_args(self, args):
+         filters = []
+         args['client'] = ACOUSTID_KEY
++        args['clientversion'] = version_string
+         args['format'] = 'xml'
+         for name, value in args.items():
+             value = str(QUrl.toPercentEncoding(value))
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 28e00f972..4116f6fd6 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69786 2012-04-23 09:37:03Z spupykin $
+# $Id: PKGBUILD 70007 2012-04-28 09:18:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
 pkgver=2.4.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://redis.io/"
@@ -19,7 +19,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
 md5sums=('ccd193d80196855343840db6110bf58d'
-         'f8fb4b00ee3636c7dc7c173e2f6a4e76'
+         '9d58bcc2bc0e193353206c608e71f5d6'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
 build() {
diff --git a/community/redis/redis.d b/community/redis/redis.d
index afd001fd5..4babbaaa5 100644
--- a/community/redis/redis.d
+++ b/community/redis/redis.d
@@ -12,9 +12,14 @@ PIDFILE=/var/run/redis.pid
 WORKDIR=/var/lib/redis
 CONF="/etc/redis.conf"
 
-PID=$(cat $PIDFILE)
+# Check if process exists
+PID=$(cat $PIDFILE 2>/dev/null)
 [ -d /proc/${PID} ] || rm -f $PIDFILE
 
+# Grab the server password, if exists
+REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\  -f 2`
+[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS"
+
 case "$1" in
   start)
     stat_busy "Starting $daemon_name"
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index c5cb45bb7..33c81da15 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69236 2012-04-10 21:23:38Z arodseth $
+# $Id: PKGBUILD 70029 2012-04-28 09:24:19Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
@@ -6,7 +6,7 @@
 
 pkgname=smalltalk
 pkgver=3.2.4
-pkgrel=6
+pkgrel=7
 pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 6a291309d..caacfc079 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69897 2012-04-25 19:17:33Z svenstaro $
+# $Id: PKGBUILD 70033 2012-04-28 14:02:07Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,13 +6,13 @@
 pkgname=widelands
 pkgver=17
 _realver=build17
-pkgrel=1
+pkgrel=2
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://widelands.org/"
 license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data')
-makedepends=('cmake' 'boost' 'ggz-client-libs')
+depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data')
+makedepends=('cmake' 'boost')
 source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
         $pkgname.desktop
         $pkgname.png