upgrading to bluez-3.2, still not luck with broadcom bluetooth devices geting discovered

svn path=/; revision=35

9 files changed, 71 insertions, 39 deletions

diff --git a/net-wireless/bluez-libs/Manifest b/net-wireless/bluez-libs/Manifest
index 2c4ffad..05ee705 100644
--- a/net-wireless/bluez-libs/Manifest
+++ b/net-wireless/bluez-libs/Manifest
@@ -1,16 +1,8 @@
-DIST bluez-libs-3.0.tar.gz 292181 RMD160 1554b6eb92968092849c9cd95be824bfdbc2c676 SHA1 9af6f0c73c8a721307e1c510f41e5d7703463a30 SHA256 96f4d70c6660e625601fe6a3d0c3edab3cb8b81860a5155bd2d3e973b308f3d7
-DIST bluez-libs-3.1.tar.gz 292268 RMD160 67dfa9f93ffc2496f4b058acbd9a3a6ca495078e SHA1 b9abc9a921c4ae308424ad99777e01acdaf93d2d SHA256 11a3ed25672112ed13e83309565d5996053bc258180b8ae7ed999f792a91b2b1
-EBUILD bluez-libs-3.0.ebuild 630 RMD160 9630614fc1fbe4f9e1abc0ec479b43859689a649 SHA1 300aa0caa83e44f91652f1f913cb709b40c19e52 SHA256 dd2d0d911ea725b335d31c604fd4affd6f20e4be3d5a9485ca8d552d66ffefe7
-MD5 b8682c71378194a1cfd9f0942b2de6c4 bluez-libs-3.0.ebuild 630
-RMD160 9630614fc1fbe4f9e1abc0ec479b43859689a649 bluez-libs-3.0.ebuild 630
-SHA256 dd2d0d911ea725b335d31c604fd4affd6f20e4be3d5a9485ca8d552d66ffefe7 bluez-libs-3.0.ebuild 630
-EBUILD bluez-libs-3.1.ebuild 630 RMD160 9630614fc1fbe4f9e1abc0ec479b43859689a649 SHA1 300aa0caa83e44f91652f1f913cb709b40c19e52 SHA256 dd2d0d911ea725b335d31c604fd4affd6f20e4be3d5a9485ca8d552d66ffefe7
-MD5 b8682c71378194a1cfd9f0942b2de6c4 bluez-libs-3.1.ebuild 630
-RMD160 9630614fc1fbe4f9e1abc0ec479b43859689a649 bluez-libs-3.1.ebuild 630
-SHA256 dd2d0d911ea725b335d31c604fd4affd6f20e4be3d5a9485ca8d552d66ffefe7 bluez-libs-3.1.ebuild 630
-MD5 77e37bde591d4be7c1d204195d4fe7c8 files/digest-bluez-libs-3.0 244
-RMD160 41acfe88c343cac03bb88c3ff3061ed5c91a765b files/digest-bluez-libs-3.0 244
-SHA256 cb398bc8b7d99cefa97dacf6827374e18f82b66bbac59fc2921bec8e9030b112 files/digest-bluez-libs-3.0 244
-MD5 0a7cffb55a16283c8ba08c413e04ce7f files/digest-bluez-libs-3.1 244
-RMD160 786bef0043a442f0b72bbe0c24a62fd59ea42820 files/digest-bluez-libs-3.1 244
-SHA256 39813cfe2992665a5e0bdb88e1eb3988847ed94757d8f3acb31d3ef6eebaa471 files/digest-bluez-libs-3.1 244
+DIST bluez-libs-3.2.tar.gz 292249 RMD160 d2c22a5d45de3ab122975c70eb9008212d99ad1f SHA1 1ab55aa2f380f50a016d33a2f034634834dcdab8 SHA256 ac48b48d6b6cfb309e87264d6f5c9852990e475d4b620d7851e3c72fc5043ab8
+EBUILD bluez-libs-3.2.ebuild 630 RMD160 9630614fc1fbe4f9e1abc0ec479b43859689a649 SHA1 300aa0caa83e44f91652f1f913cb709b40c19e52 SHA256 dd2d0d911ea725b335d31c604fd4affd6f20e4be3d5a9485ca8d552d66ffefe7
+MD5 b8682c71378194a1cfd9f0942b2de6c4 bluez-libs-3.2.ebuild 630
+RMD160 9630614fc1fbe4f9e1abc0ec479b43859689a649 bluez-libs-3.2.ebuild 630
+SHA256 dd2d0d911ea725b335d31c604fd4affd6f20e4be3d5a9485ca8d552d66ffefe7 bluez-libs-3.2.ebuild 630
+MD5 7a77df11650b307999f3572b67ddbf55 files/digest-bluez-libs-3.2 244
+RMD160 65dbb19d6548825fb8da65a1d35976714274e77c files/digest-bluez-libs-3.2 244
+SHA256 e59c8a58f3ea36c2e4b88bf7969a75567ac9754e78c09511a6add575f6047cc7 files/digest-bluez-libs-3.2 244
diff --git a/net-wireless/bluez-libs/bluez-libs-3.1.ebuild b/net-wireless/bluez-libs/bluez-libs-3.2.ebuild
index f3ebc86..f3ebc86 100644
--- a/net-wireless/bluez-libs/bluez-libs-3.1.ebuild
+++ b/net-wireless/bluez-libs/bluez-libs-3.2.ebuild
diff --git a/net-wireless/bluez-libs/files/digest-bluez-libs-3.1 b/net-wireless/bluez-libs/files/digest-bluez-libs-3.1
deleted file mode 100644
index 9f5e176..0000000
--- a/net-wireless/bluez-libs/files/digest-bluez-libs-3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f22847a16808995d25cd600cc7583913 bluez-libs-3.1.tar.gz 292268
-RMD160 67dfa9f93ffc2496f4b058acbd9a3a6ca495078e bluez-libs-3.1.tar.gz 292268
-SHA256 11a3ed25672112ed13e83309565d5996053bc258180b8ae7ed999f792a91b2b1 bluez-libs-3.1.tar.gz 292268
diff --git a/net-wireless/bluez-libs/files/digest-bluez-libs-3.2 b/net-wireless/bluez-libs/files/digest-bluez-libs-3.2
new file mode 100644
index 0000000..44ce31d
--- /dev/null
+++ b/net-wireless/bluez-libs/files/digest-bluez-libs-3.2
@@ -0,0 +1,3 @@
+MD5 864b005d9498f79e6ff924125097fe37 bluez-libs-3.2.tar.gz 292249
+RMD160 d2c22a5d45de3ab122975c70eb9008212d99ad1f bluez-libs-3.2.tar.gz 292249
+SHA256 ac48b48d6b6cfb309e87264d6f5c9852990e475d4b620d7851e3c72fc5043ab8 bluez-libs-3.2.tar.gz 292249
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 413a67b..8db3d68 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -6,19 +6,11 @@ AUX bluez-utils-2.24-udev.script 572 RMD160 f4ba713c996ba96cc6fed889029cf3b77415
 MD5 df945b8dc13a93cbbef19d118ef645d7 files/bluez-utils-2.24-udev.script 572
 RMD160 f4ba713c996ba96cc6fed889029cf3b7741533c8 files/bluez-utils-2.24-udev.script 572
 SHA256 b5064a5e7f6d5de189316e9402e6dcf074e84b4f46b8b0b50c44790028f307a2 files/bluez-utils-2.24-udev.script 572
-DIST bluez-utils-3.0.tar.gz 607945 RMD160 dbed731e49a64f6ac5fc9742d4b235b24732d798 SHA1 652c71b46367e5ec3b447fc26955bb0edfd4ae5f SHA256 15ab6093b50cd01f25cf3709249238790f7d0fe109a9dc83f100d443bd4b7e4d
-DIST bluez-utils-3.1.tar.gz 607925 RMD160 b3a4ddc16ebf423d34f97456dd17e4d0149ce90a SHA1 9cfe32ddf1817661f7e3c1b77cda7366217e56ba SHA256 518de6148c6fe0297126dcfe347da91057fdd6f711e5bb842867b6afc8adb6f2
-EBUILD bluez-utils-3.0.ebuild 2414 RMD160 09a4e3720017558a73ae40ab85af293db0b7e01d SHA1 27e433117d819671c23f7fdb0873fb07a3dd0ec8 SHA256 600d328c0c1d9280e3425f4b09e96f09f5201096718507089cffd4736d28d5b8
-MD5 08b8927a204abb7ce2e8bf01cd1e05d8 bluez-utils-3.0.ebuild 2414
-RMD160 09a4e3720017558a73ae40ab85af293db0b7e01d bluez-utils-3.0.ebuild 2414
-SHA256 600d328c0c1d9280e3425f4b09e96f09f5201096718507089cffd4736d28d5b8 bluez-utils-3.0.ebuild 2414
-EBUILD bluez-utils-3.1.ebuild 2414 RMD160 755e23e9b0621a67430435b38311f8b0e933073f SHA1 e799811f5bfff4d73ae562fd85c73a73f49d0ed6 SHA256 fd65047857a5dfa84ca16b44905696bca42bab7d1248e723b7d5a46a2f6fd987
-MD5 d3a24f4a51739ce900aab3023b4e605b bluez-utils-3.1.ebuild 2414
-RMD160 755e23e9b0621a67430435b38311f8b0e933073f bluez-utils-3.1.ebuild 2414
-SHA256 fd65047857a5dfa84ca16b44905696bca42bab7d1248e723b7d5a46a2f6fd987 bluez-utils-3.1.ebuild 2414
-MD5 11f6a387274829c1e0fd927357b1c54f files/digest-bluez-utils-3.0 247
-RMD160 f69adcb64c115393d28a684e72467c5a91b462ce files/digest-bluez-utils-3.0 247
-SHA256 ecf62d351ae541aa932e5eed421a0d5cbcec8742eff6c3a70b7b79b6e0053c86 files/digest-bluez-utils-3.0 247
-MD5 436b03c0dab26a88cf5bfe97ec8e952c files/digest-bluez-utils-3.1 247
-RMD160 9ca5f67d98cb87da0df5d4cc0c2c649ec751372e files/digest-bluez-utils-3.1 247
-SHA256 8248f743a980f6aad030624de8e5efdd1b2c47d9d2f8174451f0bddc07d21bb2 files/digest-bluez-utils-3.1 247
+DIST bluez-utils-3.2.tar.gz 608848 RMD160 ac6cd61bf2d0b529338bdd8538ffbbad0cb7cb9a SHA1 a2fb018724d70cd9e1a77e76a38101b80ac2e71a SHA256 f9058f9e8d3910cebbb3524d667ec901809c6716a6fd9baf613576217f0a6b58
+EBUILD bluez-utils-3.2.ebuild 2414 RMD160 39b653abd43fac848bf36a631561fe4eb66eedf1 SHA1 69556b16f1c7ab920aa5bfbcaeba269ea105457b SHA256 e8bcd766cb1417f3a1898f0c326f966d3fc6447e0153f0e6d0830605e656dfd9
+MD5 4bacbaec13a782b92514339c752b7e56 bluez-utils-3.2.ebuild 2414
+RMD160 39b653abd43fac848bf36a631561fe4eb66eedf1 bluez-utils-3.2.ebuild 2414
+SHA256 e8bcd766cb1417f3a1898f0c326f966d3fc6447e0153f0e6d0830605e656dfd9 bluez-utils-3.2.ebuild 2414
+MD5 5a31772064e0e402e9f5c0ea5286796f files/digest-bluez-utils-3.2 247
+RMD160 3be3fb6f7a1683a551f39179839cfbc5c0d88f51 files/digest-bluez-utils-3.2 247
+SHA256 09c1dab2039e290f9100ef4148cd3db360a81588953a4cf46129f7c3033fad46 files/digest-bluez-utils-3.2 247
diff --git a/net-wireless/bluez-utils/bluez-utils-3.1.ebuild b/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
index 918a638..d8b5c1c 100644
--- a/net-wireless/bluez-utils/bluez-utils-3.1.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="alsa cups fuse udev"
 
 RDEPEND="!net-wireless/bluez-pan
-		>=net-wireless/bluez-libs-3.1
+		>=net-wireless/bluez-libs-3.2
 		>=net-wireless/bluez-pin-0.30
 		>=sys-apps/dbus-0.31
 		dev-libs/libusb
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-3.1 b/net-wireless/bluez-utils/files/digest-bluez-utils-3.1
deleted file mode 100644
index 2233b0b..0000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d3032439c3c47ff1ce73ac2ad5bd4ccb bluez-utils-3.1.tar.gz 607925
-RMD160 b3a4ddc16ebf423d34f97456dd17e4d0149ce90a bluez-utils-3.1.tar.gz 607925
-SHA256 518de6148c6fe0297126dcfe347da91057fdd6f711e5bb842867b6afc8adb6f2 bluez-utils-3.1.tar.gz 607925
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-3.2 b/net-wireless/bluez-utils/files/digest-bluez-utils-3.2
new file mode 100644
index 0000000..547aacc
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-3.2
@@ -0,0 +1,3 @@
+MD5 a922963e16ae5d06b833d3cbe3bfc95b bluez-utils-3.2.tar.gz 608848
+RMD160 ac6cd61bf2d0b529338bdd8538ffbbad0cb7cb9a bluez-utils-3.2.tar.gz 608848
+SHA256 f9058f9e8d3910cebbb3524d667ec901809c6716a6fd9baf613576217f0a6b58 bluez-utils-3.2.tar.gz 608848
diff --git a/net-wireless/btsco/files/rc.headset b/net-wireless/btsco/files/rc.headset
new file mode 100644
index 0000000..db275e6
--- /dev/null
+++ b/net-wireless/btsco/files/rc.headset
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need bluetooth alsasound
+}
+
+checkconfig() {
+	# check that the configuration file has been configured.
+	if [ -z "$BDADDR" ]; then
+		eerror "You should setup BDADDR in /etc/conf.d/headset."
+		return 1
+	fi	
+
+	# define BTSCO in /etc/conf.d/headset to be btsco or btsco2
+	# defaults to btsco
+	if [ -z "$BTSCO" ]; then
+		BTSCO=btsco
+	fi
+	
+	if ! [ -d /sys/module/snd_bt_sco ]; then
+		ebegin "Loading bluetooth-alsa kernel module (snd_bt_sco)."
+			/sbin/modprobe snd-bt-sco
+		eend $? || return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Connecting to headset"
+        	start-stop-daemon --start \
+		--make-pidfile --pidfile /var/run/$BTSCO \
+		--background --exec /usr/bin/$BTSCO -- $BDADDR
+		sleep 1
+		ps -C $BTSCO >/dev/null
+	eend $?
+}
+
+stop() {
+        ebegin "Stopping $BTSCO daemon"
+		start-stop-daemon --stop --quiet --pidfile /var/run/$BTSCO
+	eend ${?}
+
+}
+