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

Conflicts:
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/gcin/PKGBUILD
	extra/qt/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	testing/systemd/PKGBUILD

6 files changed, 117 insertions, 26 deletions

diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index ef4a3a4b7..2ee152337 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72804 2012-06-22 13:10:36Z dreisner $
-# Maintainer: Bartłomiej Piotrowski
+# $Id: PKGBUILD 72998 2012-06-27 05:02:11Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=12
+pkgrel=13
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
@@ -27,35 +27,35 @@ md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
          'd2e4a4a22ee2aa1a986be154c647b6c6'
          '28475239d0c8b4fd778ec49f5ec72962'
          '705f394052fdd0dec22e95321d170de0'
-         'b20fe3c8487a039050986d60e45233a9'
+         '9a76cae5b3a0fcbb6116fa08c7a587b5'
          '4aaa9a7175cf327d9f7651c2586ef922')
 
 build() {
-  	cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$pkgname-$pkgver
 
-  	patch -Np1 -i $srcdir/glib2-2.32.0.patch
+    patch -Np1 -i $srcdir/glib2-2.32.0.patch
     patch -Np1 -i $srcdir/greeter-session.patch
 
     ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
-	make
+    make
   	
- 	patch -Np0 -i $srcdir/lxdm.patch
+    patch -Np0 -i $srcdir/lxdm.patch
     patch -Np0 -i $srcdir/lxdm.conf.patch
     patch -Np0 -i $srcdir/Xsession.patch
 }
 
 
 package() {
-  	cd $srcdir/$pkgname-$pkgver
-  	make DESTDIR=$pkgdir install
+    cd $srcdir/$pkgname-$pkgver
+    make DESTDIR=$pkgdir install
 
-	install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
-	install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
-	install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
+    install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
+    install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
+    install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
     install -d $pkgdir/var/{lib,run}/lxdm
 
-	# fix the greeter location
-	sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
+    # fix the greeter location
+    sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
 
     # avoid conflict with filesystem>=2012.06
     rm -r $pkgdir/var/run
diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm-pam
index 3f5df04a7..b13b0d528 100644
--- a/community/lxdm/lxdm-pam
+++ b/community/lxdm/lxdm-pam
@@ -6,3 +6,4 @@ account         required        pam_unix.so
 session         required        pam_limits.so
 session         required        pam_unix.so
 password        required        pam_unix.so
+-session optional pam_systemd.so
diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD
new file mode 100644
index 000000000..32fdfe63f
--- /dev/null
+++ b/community/mesa-dri1/PKGBUILD
@@ -0,0 +1,90 @@
+# Maintainer: ConnorBehan <connor.behan@gmail.com>
+
+pkgbase=mesa-dri1
+pkgname=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
+
+pkgver=7.11.2
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
+             'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
+md5sums=('0837c52698fe3252369c3fdb5195afcc')
+
+build() {
+    cd ${srcdir}/?esa-*
+    autoreconf -vfi
+    ./configure --prefix=/usr \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --with-dri-drivers=unichrome,mach64,mga,r128,savage,sis,tdfx \
+    --with-gallium-drivers= \
+    --disable-gallium-llvm \
+    --enable-glx-tls \
+    --with-driver=dri \
+    --enable-xcb \
+    --disable-glut \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-egl \
+    --enable-texture-float \
+    --disable-shared-dricore
+
+    make
+}
+
+package_unichrome-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
+}
+
+package_mach64-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for ATI Mach64"
+  conflicts=('xf86-video-mach64<6.8.2')
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
+}
+
+package_mga-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for Matrox"
+  conflicts=('xf86-video-mga<1.4.11')
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
+}
+
+package_r128-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for ATI Rage128"
+  conflicts=('xf86-video-r128<6.8.1')
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
+}
+
+package_savage-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
+  conflicts=('xf86-video-savage<2.3.1')
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
+}
+
+package_sis-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for SiS"
+  conflicts=('xf86-video-sis<0.10.2')
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
+}
+
+package_tdfx-dri() {
+  depends=("libgl")
+  pkgdesc="Mesa DRI drivers for 3dfx"
+  conflicts=('xf86-video-tdfx<1.4.3')
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
+}
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index f1670c20c..4aa2e680a 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 61915 2012-01-10 22:08:30Z svenstaro $
+# $Id: PKGBUILD 73004 2012-06-27 13:21:50Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
 pkgver=1.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mumble.sourceforge.net"
 license=('GPL')
-depends=('avahi' 'lsb-release' 'protobuf' 'qt>=4.4.0')
+depends=('avahi' 'lsb-release' 'protobuf' 'qt' 'icu')
 makedepends=('boost')
 conflicts=('murmur-ice' 'murmur-static' 'murmur-git')
 backup=("etc/murmur.ini"
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index a3315b1a3..be7580221 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 66513 2012-02-25 22:25:20Z lfleischer $
+# $Id: PKGBUILD 73006 2012-06-27 20:22:20Z lfleischer $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=pv
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ivarch.com/programs/pv.shtml'
 license=('custom:Artistic 2.0')
 depends=('glibc')
-source=("http://pipeviewer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('f7cc65c850ac98c6013cc448050eee4b')
+source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2")
+md5sums=('4ca3b00c92e4c79045ca2d056fb77f40')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD
index 657816316..72c1d053e 100644
--- a/community/python2-matplotlib/PKGBUILD
+++ b/community/python2-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63718 2012-02-05 12:08:58Z ibiru $
+# $Id: PKGBUILD 73010 2012-06-27 23:33:52Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,12 +6,12 @@
 
 pkgname=python2-matplotlib
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://matplotlib.sourceforge.net/"
 backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
-depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt')
+depends=('python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt')
 optdepends=('pygtk: for use with the GTK or GTKAgg backend'
             'tk: used by the TkAgg backend'
             'wxpython: for use with the WXAgg backend')