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

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

1 files changed, 42 insertions, 35 deletions

diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 8addba7db..45e9753e2 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43953 2011-04-01 08:09:21Z schiv $
+# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,25 +8,28 @@ pkgbase=jack2
 pkgname=('jack2' 'jack2-dbus')
 _tarname=jack
 pkgver=1.9.7
-pkgrel=1
-pkgdesc="The next-generation JACK with SMP support"
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 license=('GPL')
-depends=('libsamplerate')
-makedepends=('python2' 'doxygen' 'libffado' 'celt-0.7' 'dbus-core')
-optdepends=('libffado: FireWire support'
-            'celt-0.7: NetJACK2 driver'
-            'python2: jack_control')
-provides=('jack=0.118.0' 'jack-audio-connection-kit=0.118.0' 'jackdbus'
-          'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
-conflicts=('jack')
-source=(http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2)
+makedepends=('python2' 'doxygen' 'libffado' 'celt'
+             'libsamplerate' 'dbus-core')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('python2' 'doxygen' 'celt'
+             'libsamplerate' 'dbus-core')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2")
 md5sums=('9759670feecbd43eeccf1c0f743ec199')
 
 _pyfix() {
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/jack_control"
+  sed -i 's:bin/env python:bin/env python2:' "$pkgdir/usr/bin/jack_control"
+}
+
+_wafconf() {
+  if [ "$CARCH" = "mips64el" ]; then
+  python2 waf configure --prefix=/usr --alsa --doxygen $@
+  else
+  python2 waf configure --prefix=/usr --alsa --firewire --doxygen $@
+  fi
 }
 
 build() {
@@ -41,51 +44,55 @@ build() {
   # mixed dbus/classic build
   cd $_tarname-$pkgver
   msg2 "Running Mixed D-Bus/Classic build"
-
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --dbus \
-                        --classic \
-                        --firewire \
-                        --doxygen
-
+  _wafconf --classic --dbus
   python2 waf build $MAKEFLAGS
 
   # dbus-ONLY build
   cd ../$_tarname-dbus-$pkgver
   msg2 "Running D-Bus-only build"
-
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --dbus \
-                        --firewire \
-                        --doxygen
-
+  _wafconf --dbus
   python2 waf build $MAKEFLAGS
 }
 
 package_jack2() {
+  pkgdesc="The next-generation JACK with SMP support"
+  depends=('libsamplerate')
   optdepends=('libffado: FireWire support'
-              'celt-0.7: NetJACK2 driver'
+              'celt: NetJACK2 driver'
               'dbus-core: jackdbus'
               'python2: jack_control')
+[ "$CARCH" = "mips64el" ] && \
+  optdepends=('celt: NetJACK2 driver'
+              'dbus-core: jackdbus'
+              'python2: jack_control')
+  conflicts=('jack')
+  provides=('jack' 'jack-audio-connection-kit' 'jackdbus'
+            'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
 
   cd "$srcdir/$_tarname-$pkgver"
 
-  python2 waf install --destdir="$pkgdir/"
+  python2 waf install --destdir="$pkgdir"
 
   # fix for major python transition
   _pyfix
 }
 
 package_jack2-dbus() {
-  pkgdesc+=" (for D-Bus interaction only)"
-  depends+=('dbus-core')
-  conflicts+=('jack2')
+  pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
+  depends=('libsamplerate' 'dbus-core')
+  optdepends=('libffado: FireWire support'
+              'celt: NetJACK2 driver'
+              'python2: jack_control')
+[ "$CARCH" = "mips64el" ] && \
+  optdepends=('celt: NetJACK2 driver'
+              'python2: jack_control')
+  conflicts=('jack' 'jack2')
+  provides=('jack' 'jack2' 'jack-audio-connection-kit' 'jackdbus'
+            'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
 
   cd "$srcdir/$_tarname-dbus-$pkgver"
 
-  python2 waf install --destdir="$pkgdir/"
+  python2 waf install --destdir="$pkgdir"
 
   _pyfix
 }