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

Conflicts:
	community/stone-soup/PKGBUILD
	extra/maxima/PKGBUILD
	multilib/wine/PKGBUILD
	testing/rpcbind/PKGBUILD

8 files changed, 95 insertions, 18 deletions

diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
new file mode 100644
index 000000000..4851bf32c
--- /dev/null
+++ b/extra/burp/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 156101 2012-04-14 03:07:41Z dreisner $
+# Maintainer: Dave Reisner <d@falconindy.com>
+
+pkgname=burp
+pkgver=1.6.8
+pkgrel=1
+pkgdesc="A simple AUR uploader"
+arch=('i686' 'x86_64')
+url="http://github.com/falconindy/burp"
+license=('GPL')
+depends=('glibc' 'curl')
+makedepends=('perl')
+source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('57b0043994e8a9a3f8f5a27d7fef5bb4')
+
+build() {
+  make -C "$pkgname-$pkgver"
+}
+
+package() {
+  make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" MANPREFIX=/usr/share/man install
+}
+
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index f220c0d95..415735e2b 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150832 2012-02-23 12:01:17Z juergen $
+# $Id: PKGBUILD 156089 2012-04-13 11:14:35Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.26.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.0.55' 'texinfo' 'sh')
+    depends=('sbcl=1.0.56' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 427a66794..6845854ca 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150210 2012-02-14 21:34:23Z juergen $
+# $Id: PKGBUILD 156093 2012-04-13 11:44:31Z juergen $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=metalog
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Metalog is a modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
@@ -14,7 +14,7 @@ provides=('logger')
 backup=('etc/metalog.conf' 'etc/conf.d/metalog')
 source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd')
 md5sums=('e948d10d780205eae17645c89aee1361'
-         'cdd1d34eedbfbc2d9e659bf0a0f58f56'
+         '9e73301a7f0be291749ee30638527cb9'
          '86bccd5a02996921e29eff8a0394d11f')
 
 build() {
diff --git a/extra/metalog/metalog b/extra/metalog/metalog
index d30f47289..211002401 100644
--- a/extra/metalog/metalog
+++ b/extra/metalog/metalog
@@ -6,7 +6,10 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/metalog`
+if [ -f /var/run/metalog.pid ]; then
+    PID=$(cat /var/run/metalog.pid) 2>/dev/null
+fi
+
 case "$1" in
   start)
     stat_busy "Starting Metalog"
@@ -14,7 +17,6 @@ case "$1" in
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      echo $PID > /var/run/metalog.pid
       add_daemon metalog
       stat_done
     fi
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index ca4d4f1bb..43461bfb6 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 154444 2012-03-28 18:29:19Z andrea $
+# $Id: PKGBUILD 156076 2012-04-13 07:51:21Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.22
+pkgver=5.5.23
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('c5b151a70e9ceed5308f108f1ece7b3b'
+md5sums=('b614481967dc146c148027b598397b54'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index c3d022978..b425ac087 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150733 2012-02-21 12:33:12Z juergen $
+# $Id: PKGBUILD 156088 2012-04-13 11:09:01Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.55
+pkgver=1.0.56
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -19,7 +19,7 @@ makedepends=('clisp' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
-md5sums=('128fb15c80e8e3f8d4024bd8e04635e0'
+md5sums=('f9ba54b20f057e6eb5857929bb259142'
          '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index 401b390bd..48a2b68e5 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154458 2012-03-28 18:59:06Z foutrelis $
+# $Id: PKGBUILD 156097 2012-04-13 12:06:18Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
 pkgver=1.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xfce-goodies.berlios.de/"
@@ -15,12 +15,18 @@ depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme'
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
-sha256sums=('cfa85d839458fa2e9c2ee874d7d64ab00a95d6d51e6acf0ac082ffc700fe4339')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2
+        fix-french-translation.patch)
+sha256sums=('cfa85d839458fa2e9c2ee874d7d64ab00a95d6d51e6acf0ac082ffc700fe4339'
+            'acae23105905f13d65eafac2a7a03b2f15a1b143e7606ef077ace30497f6c448')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix crashes caused by the French .po file
+  # https://bugs.archlinux.org/task/29294
+  patch -Np1 -i "$srcdir/fix-french-translation.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-power-manager/fix-french-translation.patch b/extra/xfce4-power-manager/fix-french-translation.patch
new file mode 100644
index 000000000..063e533bb
--- /dev/null
+++ b/extra/xfce4-power-manager/fix-french-translation.patch
@@ -0,0 +1,46 @@
+From 634c5c016d3b6e152e20173263790a3bfbbe0640 Mon Sep 17 00:00:00 2001
+From: Mike Massonnet <mmassonnet@gmail.com>
+Date: Sun, 08 Apr 2012 11:52:33 +0000
+Subject: l10n: Updated French (fr) translation to 100%
+
+New status: 211 messages complete with 0 fuzzies and 0 untranslated.
+
+Transmitted-via: Transifex (translations.xfce.org).
+---
+diff --git a/po/fr.po b/po/fr.po
+index 78dc6d3..285393f 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -559,9 +559,8 @@ msgid ""
+ "%s (%i%%)\n"
+ "%s until is fully charged."
+ msgstr ""
+-"%s\n"
+-"Votre %s est en charge (%i%%)\n"
+-"%s jusqu'a ce qu'il soit complétement chargé."
++"%s (%i%%)\n"
++"%s jusqu'a ce qu'il soit complètement chargé."
+ 
+ #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266
+ #, c-format
+@@ -579,8 +578,7 @@ msgid ""
+ "%s (%i%%)\n"
+ "Estimated time left is %s."
+ msgstr ""
+-"%s\n"
+-"Votre %s est en décharge (%i%%)\n"
++"%s (%i%%)\n"
+ "Temps restant estimé est de %s."
+ 
+ #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269
+@@ -622,7 +620,7 @@ msgid ""
+ msgstr ""
+ "%s\n"
+ "Votre %s est en charge (%i%%)\n"
+-"%s jusqu'a ce qu'il soit complétement chargé."
++"%s jusqu'a ce qu'il soit complètement chargé."
+ 
+ #: ../src/xfpm-battery.c:444
+ #, c-format
+--
+cgit v0.9.0.3