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

Conflicts:
	community/jack2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/ntp/PKGBUILD
	extra/ortp/PKGBUILD

4 files changed, 28 insertions, 36 deletions

diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index f457100d7..1f876dec7 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60072 2011-12-04 18:08:53Z schiv $
+# $Id: PKGBUILD 61228 2011-12-25 08:59:30Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,8 +8,8 @@ pkgbase=jack2
 pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
-pkgver=1.9.7
-pkgrel=3
+pkgver=1.9.8
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
@@ -19,10 +19,10 @@ makedepends=('python2' 'doxygen' 'libffado'
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('python2' 'doxygen'
              'libsamplerate' 'dbus-core' 'celt')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2"
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
-md5sums=('9759670feecbd43eeccf1c0f743ec199'
+md5sums=('1dd2ff054cab79dfc11d134756f27165'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '471aad533ff56c5d3cbbf65ce32cadef')
 
@@ -48,7 +48,7 @@ _isbuild() {
 }
 
 build() {
-  cd "$srcdir"
+  cd "$srcdir/$_tarname-$pkgver"
 
   # fix doxygen building
   sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
@@ -76,12 +76,11 @@ build() {
 }
 
 package_jack2() {
-  ! _isbuild jack2 && return
+  ! _isbuild jack2 && return 0
 
   pkgdesc="The next-generation JACK with SMP support"
-  depends=('libsamplerate')
+  depends=('libsamplerate' 'celt')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'dbus-core: jackdbus'
               'python2: jack_control')
 [ "$CARCH" = "mips64el" ] && \
@@ -89,10 +88,9 @@ package_jack2() {
               'dbus-core: jackdbus'
               'python2: jack_control')
   conflicts=('jack')
-  provides=('jack' 'jack-audio-connection-kit'
-            'jackmp' 'jackdmp' 'jackdbus')
+  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
@@ -109,21 +107,19 @@ package_jack2() {
 }
 
 package_jack2-dbus() {
-  ! _isbuild jack2-dbus && return
+  ! _isbuild jack2-dbus && return 0
 
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'dbus-core')
+  depends=('libsamplerate' 'celt' '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'
-            'jackmp' 'jackdmp' 'jackdbus')
+  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-dbus-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index f52b03963..5b726f2c4 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 61187 2011-12-23 22:08:05Z spupykin $
+# $Id: PKGBUILD 61230 2011-12-25 16:57:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=linphone
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Voice-over-IP phone"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng"
 license=('GPL')
 depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils'
-	 'libpulse' 'libxv')
-# 'mediastreamer' 'ortp')
+	 'libpulse' 'libxv' 'mediastreamer' 'ortp')
 makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite')
 optdepends=('pulseaudio')
 options=('!libtool' '!emptydirs')
-conflicts=('ortp' 'mediastreamer')
 source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz")
 md5sums=('ad89cd6030a131f2b17ea50eb6f4c6f2')
 
@@ -26,7 +24,7 @@ build() {
   ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \
 	--enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \
 	--libexecdir=/usr/lib/$pkgname \
-	--disable-external-mediastreamer --disable-external-ortp
+	--enable-external-mediastreamer --enable-external-ortp
   make
 }
 
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 0994d635c..f2afabf04 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59579 2011-11-28 12:47:33Z spupykin $
+# $Id: PKGBUILD 61232 2011-12-25 17:05:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.4
+pkgver=2.4.5
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('8aec2c38b7d70956688cbfe3a99495fa'
+md5sums=('babeb1a1d05281b5e00ca0a519cfc3f9'
          '9726d06d0a0c60cb5d55a31b3dc1e55d'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD
index ba7b6d89a..ab8c8cddc 100644
--- a/community/setconf/PKGBUILD
+++ b/community/setconf/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 59692 2011-11-29 12:22:12Z arodseth $
+# $Id: PKGBUILD 61248 2011-12-26 01:05:59Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 pkgname=setconf
-pkgver=0.2
-pkgrel=8
-pkgdesc="A utility to easily change settings in Makefiles and other configuration files"
+pkgver=0.3
+pkgrel=1
+pkgdesc="Utility to easily change settings in Makefiles and other configuration files"
 arch=('x86_64' 'i686')
 url="http://setconf.roboticoverlords.org/"
 license=('GPL')
 depends=('pcre' 'gc')
 makedepends=('shedskin>=0.1.2')
-md5sums=('ccd0ca9527d8406d5393d77a6a56686b')
 source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
+sha256sums=('94d37bcc74d59dfa60770308e2ab3b669dc2e0716a23fda584bf71cf037f1183')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,10 +23,8 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$pkgname.1.gz" \
-    "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et: