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

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 17 insertions, 12 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 70575cf3a..580ebf716 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $
+# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,20 +7,20 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=3.0
-pkgrel=3
+pkgver=4.0
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL LGPL)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core avahi bluez gconf intltool jack sbc
-             openssl fftw orc json-c gtk2 webrtc-audio-processing
-             systemd check)
+             speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc
+             openssl fftw orc json-c gtk3 webrtc-audio-processing
+             check)
 [ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils)
 options=(!emptydirs !libtool)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
         pulseaudio.xinit)
-sha256sums=('c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d'
+sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae'
             'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
 
 build() {
@@ -43,10 +43,11 @@ build() {
 }
 
 package_pulseaudio() {
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc
-           libsamplerate webrtc-audio-processing systemd sbc)
+  depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc
+           libsamplerate webrtc-audio-processing sbc)
   optdepends=('avahi: zeroconf support'
-              'bluez: bluetooth support'
+              'bluez4: bluetooth support'
+              'bluez-libs: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
               'jack: jack support'
               'openssl: RAOP support'
@@ -56,7 +57,8 @@ package_pulseaudio() {
   install=pulseaudio.install
 
   cd $pkgbase-$pkgver
-  make -j1 DESTDIR="$pkgdir" install
+  make -j1 DESTDIR="$pkgdir" install \
+    bashcompletiondir=/usr/share/bash-completion/completions
 
   # Disable autospawn by default
   sed -e '/autospawn/iautospawn=no' \
@@ -87,6 +89,9 @@ package_pulseaudio() {
   # cap is handled in .install
   chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper"
 
+  install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \
+    "$pkgdir/usr/share/zsh/site-functions/_pulseaudio"
+
 ### Split libpulse
 
   mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}}
@@ -117,7 +122,7 @@ package_pulseaudio() {
 
 package_libpulse() {
   pkgdesc="$pkgdesc (client library)"
-  depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c)
+  depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c)
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)