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

Conflicts:
	community-testing/vdrift/PKGBUILD
	community-testing/widelands/PKGBUILD
	core/cracklib/PKGBUILD
	core/systemd/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/systemd/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/yp-tools/PKGBUILD

13 files changed, 57 insertions, 52 deletions

diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD
index e4751816e..361d3e90c 100644
--- a/community/apper/PKGBUILD
+++ b/community/apper/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74244 2012-07-23 06:20:32Z idevolder $
+# $Id: PKGBUILD 75748 2012-08-30 17:50:49Z idevolder $
 # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
 # Contributor: Zom <zom@eevul.org>
@@ -6,7 +6,7 @@
 pkgname=apper
 _pkgmainver=0.7
 pkgver=0.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE tools for PackageKit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Apper?content=84745"
@@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17')
 makedepends=('cmake' 'automoc4' 'chrpath')
 install="$pkgname.install"
 provides=('kpackagekit')
-conflicts=('kpackagekit')
+conflicts=('kpackagekit' 'gnome-packagekit')
 replaces=('kpackagekit')
 source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2")
 sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f')
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 9477323b4..14db62c38 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 74790 2012-08-05 09:41:39Z giovanni $
+# $Id: PKGBUILD 75753 2012-08-30 21:02:36Z spupykin $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
 pkgver=2.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cxx-gtk-utils.sourceforge.net/"
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 7d62a91bb..1c08888cc 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69752 2012-04-23 09:14:35Z ibiru $
+# $Id: PKGBUILD 75754 2012-08-30 21:02:43Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://couchdb.apache.org"
@@ -17,18 +17,14 @@ backup=('etc/couchdb/local.ini'
 	'etc/conf.d/couchdb'
 	'etc/logrotate.d/couchdb')
 source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "rc-script.patch" "configure-fix.patch")
+        "rc-script.patch")
 md5sums=('a5cbbcaac288831b3d8a08b725657f10'
          '890a85b22219ea113a4901a289c442f8'
-         '8a3b1a1ff98a6411827ad991db7a355b'
-         'fd1669544d08bda09c3318873d51db1e')
+         '8a3b1a1ff98a6411827ad991db7a355b')
 
 build() {
   cd "$srcdir/apache-$pkgname-$pkgver"
 
-  # workaround for FS#26827
-  patch -Np1 < $srcdir/configure-fix.patch
-
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 815214d2f..7d6c53646 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70011 2012-04-28 09:24:04Z allan $
+# $Id: PKGBUILD 75755 2012-08-30 21:02:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
 pkgver=4.1
-pkgrel=3
+pkgrel=4
 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/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 1a6789832..c95de8618 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72406 2012-06-13 13:47:51Z tdziedzic $
+# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.17
-pkgrel=3
+pkgrel=4
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 2c92df1e7..5a1c3ea57 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73620 2012-07-12 08:51:08Z spupykin $
+# $Id: PKGBUILD 75757 2012-08-30 21:03:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 # http://download.kde.org/stable/kdenlive/
diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD
index 1bcf9cf0a..49ec571c1 100644
--- a/community/nemiver/PKGBUILD
+++ b/community/nemiver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69742 2012-04-23 09:08:05Z ibiru $
+# $Id: PKGBUILD 75745 2012-08-30 17:41:15Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: jordz <jordz@archlinux.us>
 
 pkgname=nemiver
-pkgver=0.9.2
-pkgrel=2
+pkgver=0.9.3
+pkgrel=1
 pkgdesc="C/C++ debugger for GNOME"
 arch=('x86_64' 'i686')
 license=('GPL')
@@ -14,7 +14,7 @@ makedepends=('boost' 'intltool' 'gnome-doc-utils')
 install=nemiver.install
 source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz")
 options=('!libtool' '!emptydirs')
-sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520')
+sha256sums=('27b8845e54a61ba597050eb16640aaaf2bf21be3191081c9ddd3a34fc2ae617d')
 
 build() {	
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 068a93971..2cc27e414 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73482 2012-07-08 09:31:14Z ibiru $
+# $Id: PKGBUILD 75758 2012-08-30 21:03:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index e079d256a..22f568893 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72940 2012-06-25 10:53:59Z spupykin $
+# $Id: PKGBUILD 75759 2012-08-30 21:03:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=3.0.13
+pkgver=3.0.15
 pkgrel=1
-_pkgdlnr=76249
+_pkgdlnr=76337
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
@@ -14,13 +14,13 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
-	build-fix-git-2012-05-17.diff)
-md5sums=('1b3a65c77feee86e64891daae66c0c3d'
-         'e2d3409bae3676232f411f03abac440c')
+	build-fix.patch)
+md5sums=('532d977eabb4acd5a831b3526ddd8ac4'
+         'ee4699596dffb5357fdac4e3b2c98ee1')
 
 build(){
   cd $srcdir/passenger-$pkgver
-#  patch -p1 <$srcdir/build-fix-git-2012-05-17.diff
+  patch -p1 <$srcdir/build-fix.patch
   ./bin/passenger-install-apache2-module -a
   rake nginx
 
diff --git a/community/passenger/build-fix.patch b/community/passenger/build-fix.patch
new file mode 100644
index 000000000..cdbb78e68
--- /dev/null
+++ b/community/passenger/build-fix.patch
@@ -0,0 +1,12 @@
+diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp
+--- passenger-3.0.15/ext/boost/thread/xtime.hpp	2012-04-16 11:43:52.000000000 +0400
++++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp	2012-08-29 11:06:02.000000000 +0400
+@@ -18,6 +18,8 @@
+ 
+ namespace boost {
+ 
++#undef TIME_UTC
++
+ enum xtime_clock_types
+ {
+     TIME_UTC=1
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 12fcded92..03a001505 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75387 2012-08-21 18:40:56Z bpiotrowski $
+# $Id: PKGBUILD 75760 2012-08-30 21:03:31Z 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
+pkgver=1.6.0
+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')
@@ -26,20 +26,17 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.
 	'arch32-config'
 	'arch32-copyfiles'
 	'arch32-mount'
-	'arch32-nssdatabases'
-	'fix-bash-completion.patch')
-md5sums=('f6b1badef213ce8e9ef37bb3fc213390'
+	'arch32-nssdatabases')
+md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195'
          'a8d77cac806a0a9adef3f93cdbeb280a'
          '1e34db5387c4e5de911e15d8a9208bdb'
          '5a3f7b839c7e0b8933748da7c5b6385b'
          '06db41d42f9fce5449a28feb76ded556'
          'f0d5d5b5e34a860f6f90b5628c680f46'
-         'af1da6edd8c8c0dafeeb2c2c4e0c840b'
-	 '5ba775d4f401e2c167414caa548b71e5')
+         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
 
 build() {
 	cd ${pkgname}-${pkgver}
-	patch -p1 -i ${srcdir}/fix-bash-completion.patch
 	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
 	./configure \
 		--prefix=/usr \
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index c912d1a35..7d3850cfb 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 73075 2012-06-30 11:58:09Z giovanni $
+# $Id: PKGBUILD 75761 2012-08-30 21:03:36Z spupykin $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.5.902
+pkgver=0.5.3
 pkgrel=1
 pkgdesc="WYSIWYG ebook editor"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
-depends=('qtwebkit')
-makedepends=('cmake' 'gendesk')
+depends=('qtwebkit' 'boost-libs')
+makedepends=('cmake' 'gendesk' 'boost')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('7e44ce266fc2539888edd0e1ee66b05d')
+md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc')
 
 build() {
   cd "${srcdir}"
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 86b092245..716576c5a 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 74507 2012-07-29 20:16:09Z svenstaro $
+# $Id: PKGBUILD 75763 2012-08-30 21:03:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.2.2.1
-_pkgver=3.2.2-p1
+pkgver=3.2.2
+_pkgver=3.2.2
 pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
-depends=('boost-libs')
-makedepends=('boost' 'cmake>=2.8'
+depends=('boost-libs>=1.36')
+makedepends=('boost>=1.36' 'cmake>=2.8'
 	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
@@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'qt: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('d436430a4f1ae5fbcf038e645e4b5260')
+md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}