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

Conflicts:
	core/systemd/PKGBUILD
	extra/dbus-glib/PKGBUILD
	extra/samba/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD

5 files changed, 22 insertions, 21 deletions

diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index b7812f256..a17ddf0c6 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 56677 2011-10-10 09:46:09Z ibiru $
+# $Id: PKGBUILD 72991 2012-06-26 19:38:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=goocanvas
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A cairo canvas widget for GTK+"
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/GooCanvas"
 options=('!libtool' 'docs')
 license=("LGPL")
 depends=('gtk3')
-makedepends=('gobject-introspection')
+makedepends=('gobject-introspection' 'python-gobject2')
 source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.xz)
 sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553')
+sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553')
 
 build() {
   cd $srcdir/goocanvas-$pkgver
diff --git a/community/mairix/PKGBUILD b/community/mairix/PKGBUILD
index 620d79f1a..d9ddd727a 100644
--- a/community/mairix/PKGBUILD
+++ b/community/mairix/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 66226 2012-02-23 05:02:08Z spupykin $
+# $Id: PKGBUILD 72993 2012-06-26 19:39:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: Giorgio Lando <patroclo7@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=mairix
-pkgver=0.22
-pkgrel=2
+pkgver=0.23
+pkgrel=1
 pkgdesc="A program for indexing and searching emails"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rpcurnow.force9.co.uk/mairix/"
@@ -15,7 +15,7 @@ depends=(bzip2 zlib)
 makedepends=('flex' 'bison')
 install=$pkgname.install
 source=(http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('6c6aaca19c2b2de3bf567b856705ce1a')
+md5sums=('732cf94e05c779ff1ce4a9e9eb19ab44')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
index 586761908..3376d8fc2 100644
--- a/community/mariadb/PKGBUILD
+++ b/community/mariadb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 71910 2012-06-03 09:52:48Z bpiotrowski $
+# $Id: PKGBUILD 72987 2012-06-26 14:18:03Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.24
+pkgver=5.5.25
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://mariadb.org/"
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=("http://mirror.de.gsnw.de:56431/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz"
-        'mysqld')
-md5sums=('caf9461227eeadd4e57cf3f2a74b1165'
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+        mysqld)
+md5sums=('943f67c267d73a4080ab497e11740daf'
          '3bb5a9a96340feb0184bc057ee6e330b')
 
 build() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index d78c6feb1..bfdd93dae 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72338 2012-06-12 05:36:21Z bpiotrowski $
+# $Id: PKGBUILD 72985 2012-06-26 13:36:13Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.19
+pkgver=0.8.0
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('f5669a9717422b811c6bad1cc961b1e5')
+md5sums=('7efde00ad3292d4c56ad607ab676d935')
 
 build() {
   cd node-v${pkgver}
@@ -27,10 +27,10 @@ build() {
   msg 'fixing for python2 name'
   find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -e "s_'python'_'python2'_" -i {} \;
   find test -type f -exec sed -e "s|python |python2 |" -i {} \;
-  sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript
+  #sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript
   sed -i "s|python |python2 |" Makefile
-  find test -type f -exec sed -e 's/python/&2/' -i {} \;
-  sed -i "s/python/&2/" configure
+  #find test -type f -exec sed -e 's/python/&2/' -i {} \;
+  #sed -i "s/python/python2/" configure
 
   export PYTHON=python2
 
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index d6590b9c6..4626fb0ea 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70497 2012-05-09 17:18:35Z spupykin $
+# $Id: PKGBUILD 72984 2012-06-26 13:10:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Poptop server"
 arch=(i686 x86_64 'mips64el')
 url="http://poptop.sourceforge.net/"
@@ -21,7 +21,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/unrecognized-opt.patch
   autoreconf -i
-  ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share
+  ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man
   make
   sed -i 's|install -o root|install|g' plugins/Makefile
   sed -i 's|?=|=|g' plugins/Makefile