version bump. added comment about net-dialup/ppp needed for dund. made

  bluetooth run after dbus has started to take advantage of dbus if available.
  (#118786) (#120759)

(Portage version: 2.1_pre3-r1)

5 files changed, 279 insertions, 1 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index c3107719d7e3..27ce1972a003 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.67 2006/01/23 14:12:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.68 2006/02/07 14:04:40 liquidx Exp $
+
+*bluez-utils-2.25 (07 Feb 2006)
+
+  07 Feb 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/bluez-utils-2.25-init.d, +bluez-utils-2.25.ebuild:
+  version bump. added comment about net-dialup/ppp needed for dund. made
+  bluetooth run after dbus has started to take advantage of dbus if available.
+  (#118786) (#120759)
 
   23 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   bluez-utils-2.22-r1.ebuild:
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 2a0193f88f84..12c4fdea5557 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -4,6 +4,7 @@ MD5 bc6b50744c64a764187e0f446a3233de bluez-utils-2.21.ebuild 2630
 MD5 c6644dd4c0d619e6f90a24ae7b8f7a3f bluez-utils-2.22-r1.ebuild 2737
 MD5 31ae77e0e67d31710053fec9ed8a9671 bluez-utils-2.22.ebuild 2635
 MD5 61638d82b701880519a7d739d7fb08de bluez-utils-2.24.ebuild 2947
+MD5 43f459e37329db498a72480d631734bd bluez-utils-2.25.ebuild 3077
 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
@@ -23,6 +24,7 @@ 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 bd0bc22e343285373cc22a713e1c5be9 files/bluez-utils-2.25-init.d 3400
 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
@@ -31,5 +33,6 @@ 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 8ed52f505ae338adbf3e9e650ae8f77b files/digest-bluez-utils-2.25 68
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
diff --git a/net-wireless/bluez-utils/bluez-utils-2.25.ebuild b/net-wireless/bluez-utils/bluez-utils-2.25.ebuild
new file mode 100644
index 000000000000..9fb0c3ffac9e
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.25.ebuild
@@ -0,0 +1,125 @@
+# 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/bluez-utils-2.25.ebuild,v 1.1 2006/02/07 14:04:40 liquidx 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 ~hppa ~ppc ~sparc ~x86"
+
+IUSE="alsa cups dbus gtk pcmcia udev"
+
+RDEPEND="!net-wireless/bluez-pan
+		>=net-wireless/bluez-libs-2.25
+		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:" \
+		-e "s:^\(# Start dund.*\)$:\1\n# If you want to use dund, you must install\: net-dialup/ppp .:" \
+		${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}/${PN}-2.24-pin-helper.sh pin-helper
+
+	insinto /etc/bluetooth
+	newins ${FILESDIR}/${PN}-2.24-pin pin
+	fperms 0600 /etc/bluetooth/pin
+
+	newinitd ${FILESDIR}/${PN}-2.25-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}/${PN}-2.24-udev.rules 70-bluetooth.rules
+
+		exeinto /lib/udev/
+		newexe ${FILESDIR}/${PN}-2.24-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.25-init.d b/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d
new file mode 100644
index 000000000000..30105f0d9165
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d
@@ -0,0 +1,141 @@
+#!/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.25-init.d,v 1.1 2006/02/07 14:04:40 liquidx Exp $
+
+UART_CONF="/etc/bluetooth/uart"
+
+depend() {
+	after coldplug
+	after dbus
+}
+
+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/digest-bluez-utils-2.25 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.25
new file mode 100644
index 000000000000..ac0e4e5e6214
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.25
@@ -0,0 +1 @@
+MD5 ae3729ab5592be06ed01b973d4b3e9fe bluez-utils-2.25.tar.gz 592073