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.

(Portage version: 2.1.2.7)

6 files changed, 213 insertions, 1 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/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