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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 86 insertions, 31 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/Manifest b/net-wireless/bluez/Manifest
index 33b4871841e7..9e01cdcf8156 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -17,24 +17,26 @@ AUX bluez-4.18-udev.script 752 RMD160 d8f60749dbe497bef7362a4c3f56b2b83ca079cb S
 AUX bluez-4.62-makefile_ipctest.patch 1296 RMD160 19fb0c31b0981b81ea7ac9cca4780e3f93d0d870 SHA1 ce9f7f582176472cf08890ba0ac9de8187ecea57 SHA256 176c61b760fe57860d2190319854ac056850a56bc0d58c206b2be697224978ab
 AUX bluez-alsa_location.patch 539 RMD160 d4ecae8267e78d0e81a38d8ba72a8311c724a7e9 SHA1 9422e3c95fdc5e46d714d00563fcd016da6b2f24 SHA256 85d21fdd51bffb29cc45e0ab5050dd7d85ed8fa652551789bb7f5c48d7f77b44
 AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1 b273aac740e7c19aebc441c6c77e0ba8d32f3480 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2
+AUX conf.d-dund 96 RMD160 cf0a59a45f6f1bab134e4aab3545a94dfe094ae0 SHA1 c8d3196d8a917ee5240900af8478bb5adc6c7dea SHA256 fcbf3993c373a71e14557ed35854e839fd7ebf3526f753c83cee07194afca64b
+AUX init.d-dund 551 RMD160 273a9fb1989b80f12dc9813e9fe9ca42bd010e33 SHA1 51a24ecdf6d973c09553ed525e97e1cad2d6261f SHA256 e4985a2295d1cd2361b4a6a01b2d474820bf66cb1ff9251742d7aacd0fa574aa
 AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb
 DIST bluez-4.39.tar.gz 998208 RMD160 c1a5e2dbfc44713ade22d4d669f63b98da95c899 SHA1 5fbc3316c8003df47c9fe3a0f577e4518bb18185 SHA256 924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
 DIST bluez-4.66.tar.gz 990368 RMD160 9b69117652f42e1619ee18dde6801b1297e4803a SHA1 557eed51d542d95f9d5b3d7d58142c045ea4c3b1 SHA256 c223cbb80df0b1f17f6ef4efd0be1fe35ae640bd979f852cfbcc452abc0a7ea5
 DIST bluez-4.69.tar.gz 997733 RMD160 03be499fdb5064e0ec1440eddbcc452f5448566a SHA1 488a70627dd40d8a138477d5363ff1444bce77bd SHA256 10e67a9349bbd7aecc177631c2703e9bd346dffe10a4b70b058c3a1da8b98ec0
-DIST bluez-4.70.tar.gz 1030033 RMD160 5cdcb21294812cbcd482b6ce00ee7392735fab26 SHA1 0922b9e3d14def6c7f38afee163be629696fe640 SHA256 b18f5125f462c7fb6450cad346380a4ddf464adcc80aabfce5a041b56864b4b9
 DIST bluez-4.71.tar.gz 1047409 RMD160 d089165676c7b2f24d99e5d6680cd51b22f22eca SHA1 60a1bf0b9691ca017a42e57e2b0e898b39eba182 SHA256 ef9356c1097cc296747e7e82fa602279100667567bf9277f5f02668744eb0d46
+DIST bluez-4.72.tar.gz 1075806 RMD160 030f46247289c22edf0e11fd928c437e67283e16 SHA1 ba33bbf8ec49f30e0f510952cebf5e5620396d55 SHA256 2e00a5cfa0db9e8ff9ff33298307518bdbff883b1f558d18b4f27d26c515288a
 DIST oui.txt 2242423 RMD160 3bc6dddb90f1d66403318b38b808b112ff677e32 SHA1 bdccd06d48a9e6b5510f1011c0ec0114e008deda SHA256 3dd21812fb79a965c0dac89a66f7f1362f0d0eabe6e131f1cecc46bf6fe6fa1e
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
 EBUILD bluez-4.66-r1.ebuild 4793 RMD160 83ff860b7081e3863bafae762257249076d21325 SHA1 8c8e26b1e853a824d01be2b4a6c8cc636058fd41 SHA256 537bcfe966e347a8aec8cdba8b3381dc016aa48036285ef3fd9f8ec3dfbd9008
 EBUILD bluez-4.69.ebuild 4877 RMD160 dc26b6e4ac76f00631a3ab18c4bf96c502c28bf4 SHA1 fb11f9d2a5115d9a0bf9317d03d38bd13cdcf1ea SHA256 ee28dbd296557e8322c1e766edfd561729e3f2afccee04807435e35bd2190734
-EBUILD bluez-4.70.ebuild 4823 RMD160 2c4563aaf2512d5343284652f14091ae8d69efce SHA1 bf49c713433c0392a9d65555fdb7b61120298a8d SHA256 e8f678b991df29a32f4c5bf4d2848b75b30121e1b024791d80ef322952635870
 EBUILD bluez-4.71.ebuild 5049 RMD160 cc8eaa3a5a667ea9706839c583482b6d78182270 SHA1 f3b75eaf546d17a37d0754394546db455bc61b17 SHA256 c463b2fc09ce99dff62775766fd2e2b24f8f3a5599344215fad6fbfd2381e3de
-MISC ChangeLog 10101 RMD160 b1680ed73cd3f092a4c6417e24780cfdc172f4ad SHA1 a1eba60b241d1e82582ac9e4c86130d7e28a0311 SHA256 b82fddcdf4abe0d8df03454ed17f63df7ec24f580ecee41c14329079b372081c
-MISC metadata.xml 1051 RMD160 8d3015b14d452a2281ee70b60a02f64a48485fee SHA1 5d986011fc62e912adc6a7b99febef4bc0112912 SHA256 0ca8189191d4e929de33f7c9d9cba681d30507bb8cd7ad44ef688a1b92006403
+EBUILD bluez-4.72.ebuild 5197 RMD160 ee0c7b3424c5802785427011f5ef7b47b21c272f SHA1 9add5dd43bbec7c7e494240bdfcc13e27f176d14 SHA256 a9d0665fbee9ae37f909b253f2e32231b402110b512e02ca694b86860daccf5b
+MISC ChangeLog 10505 RMD160 c9b5857563ad3c4bc116711b29309e9a0b7743e1 SHA1 e4933abd38634f0464ceb15cb9b595e1721f0c80 SHA256 c2a603ece8cb6c468a66ea6b17ff423aced82d991eee85880e7d4963c8787809
+MISC metadata.xml 1117 RMD160 62bc1c1c7b5c778cbbed7cd34668337032ccd483 SHA1 795ce81485214c9224418706927a953f52da5a89 SHA256 23c4de4f42645a947bf8d4d5c8cc77b1d4afda03c2ab77d82ed746e71469586c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyKA4oACgkQCaWpQKGI+9S90QCeJm+5PGFTf1kXlWdMhdvWaur2
-12gAnAnnstF3Ih3LoU0QbXWP1zpg7YEV
-=L3sL
+iEYEARECAAYFAkydGQsACgkQCaWpQKGI+9SeLQCfd+T1lsIvXzLexjP/dXge0enA
+YxsAn1QKqeO+AD8NZ8mFu6hXINZm+mfK
+=DwW1
 -----END PGP SIGNATURE-----
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>