Version bump, add dund init.d script and remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 77 insertions, 24 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 315161876c52..7401f72a27ee 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.52 2010/09/10 10:07:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.53 2010/09/24 21:32:51 pacho Exp $
+
+*bluez-4.72 (24 Sep 2010)
+
+  24 Sep 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.70.ebuild,
+  +bluez-4.72.ebuild, +files/conf.d-dund, +files/init.d-dund, metadata.xml:
+  Version bump with multiple fixes and initial support for HDP plugin, mcap
+  plugin configure option was dropped as it is enabled when needed at
+  runtime. Provide a dund init script as demanded by DMoL in bug #328847.
+  Remove old.
 
 *bluez-4.71 (10 Sep 2010)
 
diff --git a/net-wireless/bluez/bluez-4.70.ebuild b/net-wireless/bluez/bluez-4.72.ebuild
index 848dba79ee20..87bbe3faaf69 100644
--- a/net-wireless/bluez/bluez-4.70.ebuild
+++ b/net-wireless/bluez/bluez-4.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.70.ebuild,v 1.2 2010/09/07 15:06:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.72.ebuild,v 1.1 2010/09/24 21:32:51 pacho Exp $
 
 EAPI="2"
 
@@ -8,12 +8,13 @@ inherit multilib eutils
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
+	http://standards.ieee.org/regauth/oui/oui.txt"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 
-IUSE="alsa attrib caps +consolekit cups debug gstreamer maemo6 old-daemons pcmcia pnat test-programs usb"
+IUSE="alsa attrib caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb"
 
 CDEPEND="alsa? (
 		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
@@ -76,6 +77,7 @@ src_configure() {
 		$(use_enable old-daemons pand) \
 		$(use_enable old-daemons dund) \
 		$(use_enable attrib) \
+		$(use_enable health) \
 		$(use_enable pnat) \
 		$(use_enable maemo6) \
 		$(use_enable cups) \
@@ -84,7 +86,8 @@ src_configure() {
 		--enable-configfiles \
 		$(use_enable pcmcia) \
 		$(use_enable debug) \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--disable-hal
 }
 
 src_install() {
@@ -108,6 +111,8 @@ src_install() {
 	if use old-daemons; then
 		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
 		newinitd "${FILESDIR}/init.d-hidd" hidd || die
+		newconfd "${FILESDIR}/conf.d-dund" dund || die
+		newinitd "${FILESDIR}/init.d-dund" dund || die
 	fi
 
 	insinto /etc/bluetooth
@@ -125,31 +130,40 @@ src_install() {
 
 	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth || die
 	newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die
+
+	# Install oui.txt as requested in bug #283791 and approved by upstream
+	insinto /var/lib/misc
+	doins "${DISTDIR}/oui.txt" || die
 }
 
 pkg_postinst() {
 	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
 
-	elog
-	elog "To use dial up networking you must install net-dialup/ppp."
-	elog
-	elog "For a password agent, there is for example net-wireless/bluez-gnome"
-	elog "for gnome and net-wireless/kdebluetooth for kde. You can also give a"
-	elog "try to net-wireless/blueman"
-	elog
-	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 previously enabled in /etc/conf.d/bluetooth."
+	if ! has_version "net-dialup/ppp"; then
+		elog
+		elog "To use dial up networking you must install net-dialup/ppp."
+	fi
+
+	if ! has_version "net-wireless/gnome-bluetooth" && ! has_version "net-wireless/kbluetooth"; then
+		elog
+		elog "For desktop integration you can try net-wireless/gnome-bluetooth"
+		elog "for gnome and net-wireless/kbluetooth for kde."
+	fi
+
+	if ! use old-daemons; then
+		elog
+		elog "Use the old-daemons use flag to get the old daemons like hidd or pand"
+		elog "installed. Please note that 'bluetooth' init script doesn't stop the old"
+		elog "daemons after you update it, so it's recommended to stop all of them using"
+		elog "their own init scripts or manually killing them."
+	fi
 
 	if use consolekit; then
-		elog ""
+		elog
 		elog "If you want to use rfcomm as a normal user, you need to add the user"
 		elog "to the uucp group."
 	else
-		elog ""
+		elog
 		elog "Since you have the consolekit use flag disabled, you will only be able to run"
 		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
 		elog "a regular user, you need to enable the consolekit use flag for this package or"
@@ -157,10 +171,10 @@ pkg_postinst() {
 	fi
 
 	if use old-daemons; then
-		elog ""
-		elog "The hidd init script was installed because you have the old-daemons"
-		elog "use flag on. It is not started by default via udev so please add it"
-		elog "to the required runlevels using rc-update <runlevel> add hidd. If"
+		elog
+		elog "dund and hidd init scripts were installed because you have the old-daemons"
+		elog "use flag on. They are not started by default via udev so please add them"
+		elog "to the required runlevels using rc-update <runlevel> add <dund/hidd>. If"
 		elog "you need init scripts for the other daemons, please file requests"
 		elog "to https://bugs.gentoo.org."
 	fi
diff --git a/net-wireless/bluez/files/conf.d-dund b/net-wireless/bluez/files/conf.d-dund
new file mode 100644
index 000000000000..a199fc758fe3
--- /dev/null
+++ b/net-wireless/bluez/files/conf.d-dund
@@ -0,0 +1,4 @@
+# Bluetooth DUN daemon configuraton file
+
+# Arguments to dund
+DUND_OPTIONS="--search --persist"
diff --git a/net-wireless/bluez/files/init.d-dund b/net-wireless/bluez/files/init.d-dund
new file mode 100644
index 000000000000..c8c86631fcb8
--- /dev/null
+++ b/net-wireless/bluez/files/init.d-dund
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/init.d-dund,v 1.1 2010/09/24 21:32:51 pacho Exp $
+
+depend() {
+	need bluetooth
+}
+
+start() {
+	local result service
+
+	ebegin "Starting dund"
+	start-stop-daemon --start --quiet \
+		--exec /usr/bin/dund -- ${DUND_OPTIONS}
+	result="$?"
+	eend ${result}
+}
+
+stop() {
+	ebegin "Stopping dund"
+	/usr/bin/dund -K
+	start-stop-daemon --stop --quiet --exec /usr/bin/dund
+	eend $?
+}
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index b73070b59227..566e5018cf3c 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -19,6 +19,7 @@
 			determine access to bluetooth devices based on whether a user is
 			logged in locally or remotely</flag>
 		<flag name='mcap'>Compile with initial support for MCAP</flag>
+		<flag name='health'>Compile with initial support for HDP</flag>
 		<flag name='maemo6'>Compile with maemo6 plugin</flag>
 		<flag name='old-daemons'>Install old daemons like hidd and sdpd that are
 			deprecated by the new Service framework</flag>