Version bump. Added udev helper, bug #84431.

(Portage version: 2.0.53)

9 files changed, 315 insertions, 2 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 126bf9b1683b..424630149fce 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.62 2006/01/04 21:46:16 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.63 2006/01/17 18:16:27 brix Exp $
+
+*bluez-utils-2.24 (17 Jan 2006)
+
+  17 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/bluez-utils-2.24-init.d, +files/bluez-utils-2.24-pin,
+  +files/bluez-utils-2.24-pin-helper.sh, +files/bluez-utils-2.24-udev.rules,
+  +files/bluez-utils-2.24-udev.script, +bluez-utils-2.24.ebuild:
+  Version bump. Added udev helper, bug #84431.
 
 *bluez-utils-2.22-r1 (04 Jan 2006)
 
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 8a4f986227fc..15b48e2ddde7 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,8 +1,9 @@
-MD5 e43d16f345746e3488359c7638c94498 ChangeLog 9902
+MD5 870cbff981f91cece080ec7afeae57db ChangeLog 10242
 MD5 909705b6dbfe23a99cd6353c2a1a0710 bluez-utils-2.19.ebuild 2897
 MD5 bc6b50744c64a764187e0f446a3233de bluez-utils-2.21.ebuild 2630
 MD5 d0e19891447a948a174e349b8c35304e bluez-utils-2.22-r1.ebuild 2741
 MD5 31ae77e0e67d31710053fec9ed8a9671 bluez-utils-2.22.ebuild 2635
+MD5 92382853567e2c1a4539e4d15d76e701 bluez-utils-2.24.ebuild 2837
 MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49
@@ -17,6 +18,11 @@ MD5 b0d830f3f31316886a42497d632d0ac1 files/bluez-utils-2.22-dbus-0.60.patch 374
 MD5 2844834ee91bf2b0d0cf925c682eef28 files/bluez-utils-2.22-init.d 3399
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/bluez-utils-2.22-pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/bluez-utils-2.22-pin-helper.sh 49
+MD5 32fd42576b2b919ccbb7c4c0ed3fd215 files/bluez-utils-2.24-init.d 3274
+MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/bluez-utils-2.24-pin 5
+MD5 992426019dbbd772c9326512d2a0033d files/bluez-utils-2.24-pin-helper.sh 49
+MD5 6492c6e959a40f4e32e331d2dfbd60a2 files/bluez-utils-2.24-udev.rules 74
+MD5 df945b8dc13a93cbbef19d118ef645d7 files/bluez-utils-2.24-udev.script 572
 MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295
 MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
 MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
@@ -24,5 +30,6 @@ MD5 5b6549a4300097637d65ab565a6c9535 files/digest-bluez-utils-2.19 68
 MD5 f98d1052bca4dd960f4d92ad331ba348 files/digest-bluez-utils-2.21 68
 MD5 62268482cd2b786b23286eda333562d1 files/digest-bluez-utils-2.22 68
 MD5 62268482cd2b786b23286eda333562d1 files/digest-bluez-utils-2.22-r1 68
+MD5 c4facfc6935ff330d67a8d106303d781 files/digest-bluez-utils-2.24 68
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
diff --git a/net-wireless/bluez-utils/bluez-utils-2.24.ebuild b/net-wireless/bluez-utils/bluez-utils-2.24.ebuild
new file mode 100644
index 000000000000..ab7c1b6e9304
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.24.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: £
+
+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 ~hppa ~ppc ~sparc ~x86"
+
+IUSE="alsa cups dbus gtk pcmcia udev"
+
+RDEPEND="!net-wireless/bluez-pan
+		>=net-wireless/bluez-libs-2.22
+		dev-libs/libusb
+		alsa? ( >=media-libs/alsa-lib-1.0.9 )
+		cups? ( net-print/cups )
+		dbus? ( >=sys-apps/dbus-0.31 )
+		gtk? ( >=dev-python/pygtk-2.2 )
+		pcmcia? ( virtual/pcmcia
+				  sys-apps/setserial )
+		udev? ( sys-fs/udev )"
+DEPEND="sys-devel/bison
+		sys-devel/flex
+		>=sys-apps/sed-4
+		${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i \
+		-e "s:^HIDD_ENABLE=.*:HIDD_ENABLE=false:" \
+		-e "s:^HID2HCI_ENABLE=.*:HID2HCI_ENABLE=false:" \
+		${S}/scripts/bluetooth.default
+
+	sed -i \
+		-e "s:security .*;:security user;:" \
+		${S}/hcid/hcid.conf
+
+	if use gtk; then
+		sed -i -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \
+			${S}/hcid/hcid.conf
+	else
+		sed -i -e "s:\(pin_helper \).*:\1/etc/bluetooth/pin-helper;:" \
+			${S}/hcid/hcid.conf
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable pcmcia) \
+		$(use_enable gtk bluepin) \
+		--enable-avctrl \
+		--enable-bcm203x \
+		--enable-dfutool \
+		--enable-hid2hci \
+		--enable-obex \
+		--disable-initscripts \
+		--localstatedir=/var \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README
+
+	# optional bluetooth utils
+	cd ${S}/tools
+	dosbin bccmd hcisecfilter ppporc pskey
+
+	exeinto /etc/bluetooth
+	newexe ${FILESDIR}/${P}-pin-helper.sh pin-helper
+
+	insinto /etc/bluetooth
+	newins ${FILESDIR}/${P}-pin pin
+	fperms 0600 /etc/bluetooth/pin
+
+	newinitd ${FILESDIR}/${P}-init.d bluetooth
+	newconfd ${S}/scripts/bluetooth.default bluetooth
+
+	# bug #103498
+	if use pcmcia; then
+		fperms 755 /etc/pcmcia/bluetooth
+	fi
+
+	# bug #84431
+	if use udev; then
+		insinto /etc/udev/rules.d/
+		newins ${FILESDIR}/${P}-udev.rules 70-bluetooth.rules
+
+		exeinto /lib/udev/
+		newexe ${FILESDIR}/${P}-udev.script bluetooth.sh
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "A startup script has been installed in /etc/init.d/bluetooth."
+	einfo
+	einfo "If you need to set a default PIN, edit /etc/bluetooth/pin, and change"
+	einfo "/etc/bluetooth/hcid.conf option 'pin_helper' to /etc/bluetooth/pin-helper."
+	einfo
+
+	if use gtk; then
+		einfo "By default, /usr/bin/bluepin will be launched on the desktop display"
+		einfo "for pin number input."
+		einfo
+	fi
+
+	if use udev; then
+		einfo "You need to run 'udevstart' or reboot for the udev rules to take effect."
+		einfo
+	fi
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.24-init.d b/net-wireless/bluez-utils/files/bluez-utils-2.24-init.d
new file mode 100644
index 000000000000..9d5fb758bbca
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.24-init.d
@@ -0,0 +1,140 @@
+#!/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-2.24-init.d,v 1.1 2006/01/17 18:16:27 brix Exp $
+
+UART_CONF="/etc/bluetooth/uart"
+
+depend() {
+	after coldplug
+}
+
+start_uarts() {
+	[ -f /usr/sbin/hciattach -a -f ${UART_CONF} ] || return
+	grep -v '^#' ${UART_CONF} | while read i; do
+		/usr/sbin/hciattach $i
+	done
+}
+
+stop_uarts() {
+	killall hciattach > /dev/null 2>&1
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci -0 -q    #be quiet
+		/bin/sleep 1 # delay for hid's to be detected by hotplug
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		if [ -f "${HCID_CONFIG}" ]; then
+			ebegin "    Starting hcid"
+			start-stop-daemon --start --quiet \
+				--exec /usr/sbin/hcid -- -f $HCID_CONFIG
+			eend $?
+	    else
+			ewarn "Not enabling hcid because HCID_CONFIG is missing."
+	    fi
+	fi
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Starting sdpd"
+		start-stop-daemon --start --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Starting hidd"
+		start-stop-daemon --start --quiet \
+			--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			ebegin "    Starting rfcomm"
+			/usr/bin/rfcomm -f ${RFCOMM_CONFIG} bind all
+			eend $?
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		if [ -n "${DUND_OPTIONS}" ]; then
+			ebegin "    Starting dund"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/dund -- ${DUND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting dund because DUND_OPTIONS not defined."
+		fi
+	fi
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		if [ -n "${PAND_OPTIONS}" ]; then
+			ebegin "    Starting pand"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/pand -- ${PAND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting pand because PAND_OPTIONS not defined."
+		fi
+	fi
+
+	start_uarts
+	eend 0
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		ebegin "    Stopping pand"
+		start-stop-daemon --stop --quiet --exec /usr/bin/pand
+		eend $?
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		ebegin "    Stopping dund"
+		start-stop-daemon --stop --quiet --exec /usr/bin/dund
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		ebegin "    Stopping rfcomm"
+		/usr/bin/rfcomm release all
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Stopping hidd"
+		start-stop-daemon --stop --quiet --exec /usr/bin/hidd
+		eend $?
+	fi
+
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Stopping sdpd"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		ebegin "    Stopping hcid"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+		eend $?
+	fi
+
+	stop_uarts
+	eend 0
+}
+
+restart() {
+	svc_stop
+	svc_start
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.24-pin b/net-wireless/bluez-utils/files/bluez-utils-2.24-pin
new file mode 100644
index 000000000000..81c545efebe5
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.24-pin
@@ -0,0 +1 @@
+1234
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.24-pin-helper.sh b/net-wireless/bluez-utils/files/bluez-utils-2.24-pin-helper.sh
new file mode 100644
index 000000000000..b8c05b48b219
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.24-pin-helper.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo -n "PIN:"
+cat /etc/bluetooth/pin
+
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.24-udev.rules b/net-wireless/bluez-utils/files/bluez-utils-2.24-udev.rules
new file mode 100644
index 000000000000..f4affadd04ec
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.24-udev.rules
@@ -0,0 +1,3 @@
+# Bluetooth devices:
+#
+KERNEL=="hci[0-9]*", RUN+="/lib/udev/bluetooth.sh"
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.24-udev.script b/net-wireless/bluez-utils/files/bluez-utils-2.24-udev.script
new file mode 100644
index 000000000000..516c046641bf
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.24-udev.script
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# bluetooth.sh: udev external RUN script
+#
+# Copyright 2005-2006 Henrik Brix Andersen <brix@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
+	$script stop
+    fi
+else
+    if ! $script --quiet status; then
+	$script start
+    fi
+fi
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.24 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.24
new file mode 100644
index 000000000000..a3d2261d8d50
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.24
@@ -0,0 +1 @@
+MD5 5f5488ff3d31bdb9cd36b7991fe68408 bluez-utils-2.24.tar.gz 585401