Version bump. A new simpler init script that uses the service architechture so we only need the hcid daemon. Disabled alsa, obex and sync support because upstream says they are not working yet. Added examples use flag to install the echo example service, old-daemons to install the old daemons and test-programs to install l2test and rctest programs. Made the udev helper use IN_HOTPLUG and fix starting the service via udev. Fixes bug #178268, #178210, #178160, #160273 and #144812.

Package-Manager: portage-2.1.2.7

7 files changed, 240 insertions, 8 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index c433e61258da..e3759fd61a75 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.91 2007/05/16 09:51:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.92 2007/05/16 12:34:45 betelgeuse Exp $
+
+*bluez-utils-3.10.1 (16 May 2007)
+
+  16 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/bluez-utils-3.10.1-init.d, +files/bluez-utils-3.10.1-udev.rules,
+  +files/bluez-utils-3.10.1-udev.script, +bluez-utils-3.10.1.ebuild:
+  Version bump. A new simpler init script that uses the service architechture
+  so we only need the hcid daemon. Disabled alsa, obex and sync support
+  because upstream says they are not working yet. Added examples use flag to
+  install the echo example service, old-daemons to install the old daemons and
+  test-programs to install l2test and rctest programs. Made the udev helper
+  use IN_HOTPLUG and fix starting the service via udev. Fixes bug #178268, 
+  #178210, #178160, #160273 and #144812.
 
 *bluez-utils-3.10-r2 (16 May 2007)
 
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index a8067b23fd33..b428ce7fc4db 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -53,6 +53,18 @@ AUX bluez-utils-3.10-init.d 3404 RMD160 d5c51ae98b5bb4c1a8c6933a29fb7d0f0bd598e8
 MD5 e15fb6566a0e10e96322b884f778f4fa files/bluez-utils-3.10-init.d 3404
 RMD160 d5c51ae98b5bb4c1a8c6933a29fb7d0f0bd598e8 files/bluez-utils-3.10-init.d 3404
 SHA256 b4248e2728e36d4fc17106981a42e0cc0909bf6ef78b06d8e2876f6a9a005b7f files/bluez-utils-3.10-init.d 3404
+AUX bluez-utils-3.10.1-init.d 1035 RMD160 d48f9b2b6382b52c5959f9b26d1928ad5b9c7d63 SHA1 919f297838c6f214190774fdaf095b24017ca489 SHA256 55af36d5c2dbd338db7ee7658b2d97c3bd4333cad79d79357880ae058b1ad280
+MD5 692876c207c41641f319c054d58fd36d files/bluez-utils-3.10.1-init.d 1035
+RMD160 d48f9b2b6382b52c5959f9b26d1928ad5b9c7d63 files/bluez-utils-3.10.1-init.d 1035
+SHA256 55af36d5c2dbd338db7ee7658b2d97c3bd4333cad79d79357880ae058b1ad280 files/bluez-utils-3.10.1-init.d 1035
+AUX bluez-utils-3.10.1-udev.rules 134 RMD160 06f2292bb0ae995ab15b4bda614d5ace543ca61a SHA1 35fca72477c86d54f4c5798f0ea73e29c4b4426a SHA256 51c3c50563dc7e52621e532e338a18757f3eef53e8d00d410c169cc78fe0f81b
+MD5 6e9849f5765aec17b75d982f9428cb11 files/bluez-utils-3.10.1-udev.rules 134
+RMD160 06f2292bb0ae995ab15b4bda614d5ace543ca61a files/bluez-utils-3.10.1-udev.rules 134
+SHA256 51c3c50563dc7e52621e532e338a18757f3eef53e8d00d410c169cc78fe0f81b files/bluez-utils-3.10.1-udev.rules 134
+AUX bluez-utils-3.10.1-udev.script 653 RMD160 365ec086f380a00f753fdafad9fbfeb27014005c SHA1 6a0e20756337dffa181c84f61aedf519580eb43c SHA256 170e21623ad6ffb1d966db2de047c7596025828edf76ebad1807004277dd8107
+MD5 0c23eedee6cf9cd4f26d03d17d69d89e files/bluez-utils-3.10.1-udev.script 653
+RMD160 365ec086f380a00f753fdafad9fbfeb27014005c files/bluez-utils-3.10.1-udev.script 653
+SHA256 170e21623ad6ffb1d966db2de047c7596025828edf76ebad1807004277dd8107 files/bluez-utils-3.10.1-udev.script 653
 AUX pin.sample 26 RMD160 d765102515a5a74f4e21045572253aca3086a52f SHA1 694988c2dc3b0c50322f5513ae5f731b3471b06a SHA256 d1da7197eca196913a2e43adc3e54630f10f7a60631e4fc444e73d3f30ad5c2c
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
 RMD160 d765102515a5a74f4e21045572253aca3086a52f files/pin.sample 26
@@ -60,6 +72,7 @@ SHA256 d1da7197eca196913a2e43adc3e54630f10f7a60631e4fc444e73d3f30ad5c2c files/pi
 DIST bluez-utils-2.22.tar.gz 545622 RMD160 cfde7cb0b6529e5348fdf8ba7871ae8b5f93eec2 SHA1 935b18eddda878e63199dd94140bae0a505c26a6 SHA256 9700376d6106b29bf2fbeb9b347c00ee80a22ab0771a7def2e5fd5eae1e0fe39
 DIST bluez-utils-2.24.tar.gz 585401 RMD160 b1aa8cee2ce8cafb08312e1da2e2be908ed1ac22 SHA1 71c9170c0a2e4a387d14710b8c7d3c189a05d169 SHA256 06290c2d6b05d8f6736038c86fe12bb63f6661dcbf95563a531b93085503c991
 DIST bluez-utils-2.25.tar.gz 592073 RMD160 ec28db230c8f612f799dc7ca4e77480093e8c8f3 SHA1 fa28eaf4e81cdf5b05acf80bd8d5614f9ee3eb3e SHA256 dce533631ddba65044293f6fb5ee429232c1a8bf0146e0b7af89add348d0fc3f
+DIST bluez-utils-3.10.1.tar.gz 803406 RMD160 1bfafed6f09419dad316be51d286df9c23577c15 SHA1 8ec85637db4d5f10cde6586b1a73813a4f1157a7 SHA256 26d5bb455114605537ff9e9c1b2a67b64eddd403de39991085eeb8abe4172024
 DIST bluez-utils-3.10.tar.gz 802676 RMD160 12a0d419535a20be5df5afb65134b13a196bc962 SHA1 02c1338e7d7bffeab8ef05c6c22c23242c2b3ae7 SHA256 37c02eeb26cf59e9252e423c9326beaaff61f25bc5186b7f5ce3faacd6a8bc89
 EBUILD bluez-utils-2.22-r1.ebuild 2737 RMD160 5cb85765c1d08f5d94a4f84c8248c542be75c8d3 SHA1 f58912d738a24a67feaa7367939fc96ebd49ee9a SHA256 6e9283ed7c65a2a04090762a663ba4370e0ef25f2971c0069faa3b781a9e2469
 MD5 c6644dd4c0d619e6f90a24ae7b8f7a3f bluez-utils-2.22-r1.ebuild 2737
@@ -81,14 +94,18 @@ EBUILD bluez-utils-3.10-r2.ebuild 2526 RMD160 d720d7c220a4eee248f5a534a10e2ba266
 MD5 ed4dd5a072d257d18bc381b8e71e28b3 bluez-utils-3.10-r2.ebuild 2526
 RMD160 d720d7c220a4eee248f5a534a10e2ba2663c1ec8 bluez-utils-3.10-r2.ebuild 2526
 SHA256 530239136f6476d2d13e2993ffe69b1bdb2a925a0c6a4784a53124be1754f734 bluez-utils-3.10-r2.ebuild 2526
+EBUILD bluez-utils-3.10.1.ebuild 3538 RMD160 de085da270a44598e28c3a366719f75aa397c8c6 SHA1 d208d707dc90723ff300f2d633e218663ab45fd3 SHA256 abbca6367a7cdac5f72b79568b2cc5a7d21f99f015c018be0a95632d5628d943
+MD5 c64a106b9897929fad5b632e7ec7bb51 bluez-utils-3.10.1.ebuild 3538
+RMD160 de085da270a44598e28c3a366719f75aa397c8c6 bluez-utils-3.10.1.ebuild 3538
+SHA256 abbca6367a7cdac5f72b79568b2cc5a7d21f99f015c018be0a95632d5628d943 bluez-utils-3.10.1.ebuild 3538
 EBUILD bluez-utils-3.10.ebuild 2373 RMD160 242e621fad2f7d831d4b51d62c52297f23bc5861 SHA1 d871584fc98fa35f0e2ac406ef1450b34ec16636 SHA256 355ba39e5fe18f477ea14a8d2b0f0cd28f9af5ed17a4b803d3924e59e1bdea1d
 MD5 3d8279ea4a89ebdee83f05af0d770cd7 bluez-utils-3.10.ebuild 2373
 RMD160 242e621fad2f7d831d4b51d62c52297f23bc5861 bluez-utils-3.10.ebuild 2373
 SHA256 355ba39e5fe18f477ea14a8d2b0f0cd28f9af5ed17a4b803d3924e59e1bdea1d bluez-utils-3.10.ebuild 2373
-MISC ChangeLog 14597 RMD160 f4069ba485195878058d63f368f5a6fd0dfefcc8 SHA1 3a6faab4c55356ef766039c0afb713be5559afa0 SHA256 40750024533b3c79741c331d250bf97ef320cf6b490773dcbf511f1bc5076fb3
-MD5 76ce1bd85591aa635a98813f7c2e65dc ChangeLog 14597
-RMD160 f4069ba485195878058d63f368f5a6fd0dfefcc8 ChangeLog 14597
-SHA256 40750024533b3c79741c331d250bf97ef320cf6b490773dcbf511f1bc5076fb3 ChangeLog 14597
+MISC ChangeLog 15328 RMD160 91d3a5a2b0c7093a66b3199232636f37c3a65dce SHA1 ec9e8e583af5018a223e3d9555812b5dd85e374e SHA256 3fa6952bf4e9ca4e61624e06cda988faaad2648a140c79737526fa2059a3fce6
+MD5 1e0027ee3405c7fa7345a256fea8bd05 ChangeLog 15328
+RMD160 91d3a5a2b0c7093a66b3199232636f37c3a65dce ChangeLog 15328
+SHA256 3fa6952bf4e9ca4e61624e06cda988faaad2648a140c79737526fa2059a3fce6 ChangeLog 15328
 MISC metadata.xml 379 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd SHA1 243ba54e82b478d5941198402cbaa00badd656d9 SHA256 a104a4d733fb797bc867c3c92090dc716305795aa09441a6b7a4b442ff52e669
 MD5 b996228cd1649e0bf48029de7d85ea6d metadata.xml 379
 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd metadata.xml 379
@@ -111,10 +128,13 @@ SHA256 37e7dcc1f13a26116af761961e867a3d32534d020a743da7246580996f6f89b5 files/di
 MD5 9bece5b58aebefa1b5f205f6365dd9cc files/digest-bluez-utils-3.10-r2 250
 RMD160 c9c68afbcd31e7a223c1c7bc4b4fd964594f8c0f files/digest-bluez-utils-3.10-r2 250
 SHA256 37e7dcc1f13a26116af761961e867a3d32534d020a743da7246580996f6f89b5 files/digest-bluez-utils-3.10-r2 250
+MD5 0d6f1d3a621eeb9c3743a735c4c59b66 files/digest-bluez-utils-3.10.1 256
+RMD160 888ec7101d52c2df9039812e48b6294c862d69d2 files/digest-bluez-utils-3.10.1 256
+SHA256 c0d22b7a4b6f1b143493afa595235f9fe3af627bd3309049376d2f33bd6b05d4 files/digest-bluez-utils-3.10.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGStRLcxLzpIGCsLQRAtsqAJ9jgss21AAqfCekL6zeT97CC6cifACfUaYH
-sP741xSK98aEPlNnn4enT0k=
-=lJ+e
+iD8DBQFGSvp0cxLzpIGCsLQRApXhAJ9aUNoWQXFqGAO6zm9137LCJ2V8xwCfQBhz
+BylE8StNL9/dvtYBrJHO2a4=
+=HVy1
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-utils/bluez-utils-3.10.1.ebuild b/net-wireless/bluez-utils/bluez-utils-3.10.1.ebuild
new file mode 100644
index 000000000000..43b74d95cc40
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-3.10.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-3.10.1.ebuild,v 1.1 2007/05/16 12:34:45 betelgeuse Exp $
+
+inherit eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+IUSE="cups debug examples hal old-daemons test-programs usb"
+
+DEPEND="
+	>=net-wireless/bluez-libs-3.10
+	hal? ( sys-apps/hal )
+	usb? ( dev-libs/libusb )
+	cups? ( net-print/cups )
+	sys-fs/udev
+	dev-libs/glib
+	sys-apps/dbus"
+
+src_unpack() {
+	unpack ${A}
+	# bundled glib
+	cd "${S}"
+	rm -r eglib/{*.c,*.h}  || die
+}
+
+src_compile() {
+	# the order is the same as ./configure --help
+
+	# we don't need the other daemons either with the new
+	# service architechture
+	# hcid has in integrated sdpd now that we use
+
+	# These are currently under work and don't work properly:
+	# --enable-alsa
+	# --enable-sync
+	# --enable-obex
+	# Only for embedded devices
+	# --enable-audio
+
+	econf \
+		$(use_enable debug) \
+		--enable-inotify \
+		$(use_enable hal) \
+		$(use_enable usb) \
+		--enable-glib  \
+		--disable-obex \
+		--disable-alsa \
+		--enable-network \
+		--enable-serial \
+		--enable-input \
+		--disable-audio \
+		--disable-sync \
+		$(use_enable examples echo) \
+		--enable-hcid \
+		$(use_enable test-programs test) \
+		$(use_enable old-daemons sdpd) \
+		$(use_enable old-daemons hidd) \
+		$(use_enable old-daemons pand) \
+		$(use_enable cups) \
+		--enable-configfiles \
+		--disable-initscripts \
+		--disable-pcmciarules \
+		--enable-bccmd \
+		--enable-avctrl \
+		--enable-hid2hci \
+		--enable-dfutool \
+		--localstatedir=/var \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README || die
+
+	# a very simple example daemon
+	dobin daemon/passkey-agent || die
+
+	newinitd "${FILESDIR}/${PN}-3.10.1-init.d" bluetooth || die
+	newconfd "${S}/scripts/bluetooth.default" bluetooth || die
+
+	# bug #84431
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}/${PN}-3.10.1-udev.rules" 70-bluetooth.rules || die
+	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
+
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/${PN}-3.10.1-udev.script" bluetooth.sh || die
+	doexe  "${S}/scripts/bluetooth_serial" || die
+}
+
+pkg_postinst() {
+	udevcontrol reload_rules && udevtrigger
+
+	elog
+	elog "To use dial up networking you must install net-dialup/ppp"
+	elog ""
+	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
+	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
+	elog "For a password asking program, there is for example"
+	elog "net-wireless/bluez-gnome for gnome and net-wireless/kdebluetooth"
+	elog "for kde."
+	elog ""
+	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
+	elog "on the new service architechture:"
+	elog "http://wiki.bluez.org/wiki/Services"
+	elog "See /etc/bluetooth/*.service for enabling the services."
+	elog "Use the old-daemons use flag to get the old daemons like hidd"
+	elog "installed. Please note that the init script doesn't stop the old"
+	elog "daemons after you update it so it's recommended to run:"
+	elog "  /etc/init.d/bluetooth stop"
+	elog "before updating your configuration files or you can manually kill"
+	elog "the extra daemons you enable in /etc/conf.d/bluetooth."
+	elog ""
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-3.10.1-init.d b/net-wireless/bluez-utils/files/bluez-utils-3.10.1-init.d
new file mode 100644
index 000000000000..2e182fe99055
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-3.10.1-init.d
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/files/bluez-utils-3.10.1-init.d,v 1.1 2007/05/16 12:34:45 betelgeuse Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+	local result=0
+	HCID_CONFIG="${HCID_CONFIG:-/etc/bluetooth/hcid.conf}"
+
+	if [ -f "${HCID_CONFIG}" ]; then
+		ebegin "    Starting hcid"
+		# -s enables internal sdp server
+		start-stop-daemon --start \
+			--exec /usr/sbin/hcid -- -s -f "${HCID_CONFIG}"
+		eend $?
+	else
+		eerror "Can't start hcid because HCID_CONFIG is missing."
+	    eend 1
+		result=1
+	fi
+
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci --tohci -q    #be quiet
+		eend $?
+		[ "${result}" = "0" ] && result=$?
+	fi
+
+	eend ${result}
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+
+	start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+	eend $?
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-3.10.1-udev.rules b/net-wireless/bluez-utils/files/bluez-utils-3.10.1-udev.rules
new file mode 100644
index 000000000000..775f13471dab
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-3.10.1-udev.rules
@@ -0,0 +1,2 @@
+# Start/Stop bluetooth service on device insertion. Gentoo specific.
+SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="bluetooth.sh"
diff --git a/net-wireless/bluez-utils/files/bluez-utils-3.10.1-udev.script b/net-wireless/bluez-utils/files/bluez-utils-3.10.1-udev.script
new file mode 100644
index 000000000000..de0a967e9913
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-3.10.1-udev.script
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# bluetooth.sh: udev external RUN script
+#
+# Copyright:
+#	2005-2006 Henrik Brix Andersen <brix@gentoo.org>
+#   2007      Petteri Räty <betelgeuse@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+script=/etc/init.d/bluetooth
+
+# Find out where sysfs is mounted. Exit if not available
+sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'`
+if [ "$sysfs" = "" ]; then
+	echo "sysfs is required"
+	exit 1
+fi
+
+if [ ! -d $sysfs/class/bluetooth/hci[0-9]* ]; then
+	if $script --quiet status; then
+		IN_HOTPLUG=1 $script --quiet stop
+	fi
+else
+	if ! $script --quiet status; then
+		IN_HOTPLUG=1 $script --quiet start
+	fi
+fi
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-3.10.1 b/net-wireless/bluez-utils/files/digest-bluez-utils-3.10.1
new file mode 100644
index 000000000000..ead29ccbf131
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-3.10.1
@@ -0,0 +1,3 @@
+MD5 ac3661a2ab9fd40a365e70760abd1093 bluez-utils-3.10.1.tar.gz 803406
+RMD160 1bfafed6f09419dad316be51d286df9c23577c15 bluez-utils-3.10.1.tar.gz 803406
+SHA256 26d5bb455114605537ff9e9c1b2a67b64eddd403de39991085eeb8abe4172024 bluez-utils-3.10.1.tar.gz 803406