From 71428dfc8edf503dbaf8816eac04fe97e4f7fbd4 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 25 Feb 2011 22:54:52 +0000
Subject: bluez: Update to latest (4.89) and PKGBUILD fixes.

---
 abs/extra/bluez/PKGBUILD | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index edcfad4..0b6f49c 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -1,20 +1,27 @@
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 pkgname=bluez
-pkgver=4.88
+pkgver=4.89
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('dbus-core' 'glib2')
-makedepends=('gstreamer0.10-base' 'alsa-lib' 'libusb')
-optdepends=('gstreamer0.10-base' 'alsa-lib' 'libusb')
+depends=('dbus-core')
+makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile')
+optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
+	"alsa-lib: Audio bluetooth devices support"
+	"dbus-python: to run bluez-simple-agent"
+	"pygobject: to run bluez-simple-agent"
+	"libusb-compat: USB adapters support"
+	"cups: CUPS backend"
+	"libnl: netlink plugin")
 conflicts=('bluez-libs' 'bluez-utils')
 provides=('bluez-libs' 'bluez-utils')
 replaces=('bluez-libs' 'bluez-utils')
+options=('!libtool')
+backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
+        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
 install='bluez.install'
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input}.conf
-        etc/conf.d/bluetooth)
 source=("http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
         bluetooth.conf.d run.bluetoothd run.hidd run.dund run.pand
         run.rfcomm)
@@ -39,13 +46,18 @@ build() {
     --enable-configfiles || return 1
   make || return 1
 }
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install || return 1
 
-  install -D -m644 "$srcdir/$pkgname-$pkgver/network/network.conf" "$pkgdir/etc/bluetooth/" || return 1
-  install -D -m644 "$srcdir/$pkgname-$pkgver/input/input.conf"     "$pkgdir/etc/bluetooth/" || return 1
-  install -D -m644 "$srcdir/$pkgname-$pkgver/audio/audio.conf"     "$pkgdir/etc/bluetooth/" || return 1
+  install -d ${pkgdir}/etc/bluetooth
+  install -m644 network/network.conf \
+                input/input.conf \
+                audio/audio.conf \
+                serial/serial.conf \
+    ${pkgdir}/etc/bluetooth/
+
   install -D -m644 "$srcdir/bluetooth.conf.d"                     "$pkgdir/etc/conf.d/bluetooth" || return 1
   install -D -m755 "$srcdir/run.bluetoothd"                       "$pkgdir/etc/sv/bluetoothd/run" || return 1
   install -D -m755 "$srcdir/run.hidd"                             "$pkgdir/etc/sv/hidd/run" || return 1
@@ -53,10 +65,11 @@ package() {
   install -D -m755 "$srcdir/run.pand"                             "$pkgdir/etc/sv/pand/run" || return 1
   install -D -m755 "$srcdir/run.rfcomm"                           "$pkgdir/etc/sv/rfcomm/run" || return 1
   
-  sed -i 's#/usr/bin/python#/usr/bin/python2#' test/simple-agent
   install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
+  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
+    ${pkgdir}/usr/bin/bluez-simple-agent
 }
-md5sums=('c45ae86eb17c525f823e3e2d77e9b51e'
+md5sums=('e35936694cc745987ebce2053c51a840'
          'd12be5b494525bb1ba6eac5c3983dd3e'
          '1c88fcd455920ad8ee0c7cae3fe15771'
          'a9c1b4da8b5a3969865272bd0fb01da2'
-- 
cgit v0.12

