From 92bdbc906f684a92ea8db94cfb79c9fa77623c59 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 30 Sep 2011 11:51:53 +0200
Subject: [PATCH] gnome-bluetooth: update to 3.2.0.

---
 .../gnome-bluetooth-devel.template            | 27 ++-------
 srcpkgs/gnome-bluetooth/template              | 55 ++++++-------------
 2 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
index af383c00e07..1fcdb6b027c 100644
--- a/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
+++ b/srcpkgs/gnome-bluetooth/gnome-bluetooth-devel.template
@@ -5,31 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
-Add_dependency run intltool
-Add_dependency run gnome-doc-utils
-Add_dependency run glib-devel
-Add_dependency run dbus-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run gdk-pixbuf-devel
-Add_dependency run libpng-devel
-Add_dependency run atk-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
-Add_dependency run libbluetooth-devel
-Add_dependency run gtk+3-devel
-Add_dependency run libunique-devel
-Add_dependency run libnotify-devel
-Add_dependency run GConf-devel
-Add_dependency run gnome-control-center-devel
 Add_dependency run gnome-bluetooth
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index c764fcbca8a..889b822500a 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.0.1
-distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2"
+version=3.2.0
+distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-desktop-update --disable-schemas-compile
---localstatedir=/var --disable-icon-update --disable-scrollkeeper"
+--localstatedir=/var --disable-icon-update"
 short_desc="The GNOME Bluetooth Subsystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GnomeBluetooth"
 license="GPL, LGPL"
-checksum=bce843f7cf690c595678fd554b546bd35175f6e7afa70a1463037a0367b3fd38
+checksum=7f8f35baf4a785a4d966257c31ce6ee8eb4fe21bc83b26cadc55c244f583bbca
 long_desc="
  This package contains tools for managing and manipulating Bluetooth devices
  using the GNOME desktop.
@@ -25,53 +25,34 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
-Add_dependency run dbus-libs
-Add_dependency run dbus-glib
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
+Add_dependency run gtk+3
 Add_dependency run atk
-Add_dependency run glib
 Add_dependency run pango
+Add_dependency run gdk-pixbuf
 Add_dependency run cairo
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run gtk+3
-Add_dependency run libunique
+Add_dependency run glib
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
 Add_dependency run libnotify
-Add_dependency run GConf
-Add_dependency run gnome-control-center
+
+Add_dependency run dconf
+Add_dependency run bluez		">=0"
+Add_dependency run gvfs
+Add_dependency run obexd-client		">=0"
+Add_dependency run hicolor-icon-theme
+Add_dependency run desktop-file-utils
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
-Add_dependency build glib-devel
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build libpng-devel
-Add_dependency build atk-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build libbluetooth-devel
-Add_dependency build gtk+3-devel
-Add_dependency build libunique-devel
-Add_dependency build libnotify-devel
-Add_dependency build GConf-devel
-Add_dependency build gnome-control-center-devel
+Add_dependency build gobject-introspection
 Add_dependency build nautilus-sendto-devel
 
-Add_dependency full bluez			">=0"
-Add_dependency full gvfs
-Add_dependency full obexd-client		">=0"
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
-
 post_install()
 {
-	install -m644 -D ${FILESDIR}/61-gnome-bluetooth-rfkill.rules \
-		${DESTDIR}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules
+	vinstall ${FILESDIR}/61-gnome-bluetooth-rfkill.rules 644 lib/udev/rules.d
 	install -d ${DESTDIR}/etc/ld.so.conf.d
 	echo "/usr/lib/gnome-bluetooth" > \
 		${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf