Reintroduce a bluetooth init.d script to trigger bluetooth devices after dbus is started because, as talked with WilliamH, udev-postmount will be removed in the near future due upstream no longer detecting failed triggers at early boot. This should also solve bug 397673 by a.m. Drop old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 49 insertions, 13 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 80ec2a82b469..e3ab24b2f874 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.111 2012/01/06 22:34:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.112 2012/01/09 23:01:55 pacho Exp $
+
+*bluez-4.97-r3 (09 Jan 2012)
+*bluez-4.97-r2 (09 Jan 2012)
+
+  09 Jan 2012; Pacho Ramos <pacho@gentoo.org> +bluez-4.97-r2.ebuild,
+  +bluez-4.97-r3.ebuild, +files/bluetooth-init.d-r1, -bluez-4.97-r1.ebuild,
+  -bluez-4.97.ebuild:
+  Reintroduce a bluetooth init.d script to trigger bluetooth devices after dbus
+  is started because, as talked with WilliamH, udev-postmount will be removed in
+  the near future due upstream no longer detecting failed triggers at early
+  boot. This should also solve bug 397673 by a.m. Drop old.
 
   06 Jan 2012; Mike Frysinger <vapier@gentoo.org> bluez-4.97.ebuild,
   bluez-4.97-r1.ebuild:
diff --git a/net-wireless/bluez/bluez-4.97.ebuild b/net-wireless/bluez/bluez-4.97-r2.ebuild
index 04a55ff6fbba..cde2c129adf5 100644
--- a/net-wireless/bluez/bluez-4.97.ebuild
+++ b/net-wireless/bluez/bluez-4.97-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97.ebuild,v 1.2 2012/01/06 22:34:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r2.ebuild,v 1.1 2012/01/09 23:01:55 pacho Exp $
 
 EAPI="4"
 PYTHON_DEPEND="test-programs? 2"
@@ -134,11 +134,7 @@ src_install() {
 		network/network.conf \
 		serial/serial.conf
 
-	insinto /lib/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/${PN}-4.67-udev.script" bluetooth.sh
-
+	newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth
 	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
 	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
 
@@ -165,4 +161,11 @@ pkg_postinst() {
 		elog "a regular user, you need to enable the consolekit use flag for this package or"
 		elog "to add the user to the plugdev group."
 	fi
+
+	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
+		elog "You will need to add bluetooth service to default runlevel"
+		elog "for getting your devices detected from startup without needing"
+		elog "to reconnect them. For that please run:"
+		elog "'rc-update add bluetooth default'"
+	fi
 }
diff --git a/net-wireless/bluez/bluez-4.97-r1.ebuild b/net-wireless/bluez/bluez-4.97-r3.ebuild
index 9d2d9367e2d8..7c3fcfbf0e20 100644
--- a/net-wireless/bluez/bluez-4.97-r1.ebuild
+++ b/net-wireless/bluez/bluez-4.97-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r1.ebuild,v 1.2 2012/01/06 22:34:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.97-r3.ebuild,v 1.1 2012/01/09 23:01:55 pacho Exp $
 
 EAPI="4"
 PYTHON_DEPEND="test-programs? 2"
@@ -135,11 +135,7 @@ src_install() {
 		network/network.conf \
 		serial/serial.conf
 
-	insinto /lib/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/${PN}-4.67-udev.script" bluetooth.sh
-
+	newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth
 	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
 	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
 
@@ -166,4 +162,11 @@ pkg_postinst() {
 		elog "a regular user, you need to enable the consolekit use flag for this package or"
 		elog "to add the user to the plugdev group."
 	fi
+
+	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
+		elog "You will need to add bluetooth service to default runlevel"
+		elog "for getting your devices detected from startup without needing"
+		elog "to reconnect them. For that please run:"
+		elog "'rc-update add bluetooth default'"
+	fi
 }
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r1 b/net-wireless/bluez/files/bluetooth-init.d-r1
new file mode 100644
index 000000000000..9280f93bac89
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-init.d-r1
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r1,v 1.1 2012/01/09 23:01:55 pacho Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount hostname
+}
+
+start() {
+   	ebegin "Udev coldplug of bluetooth devices"
+	udevadm trigger --subsystem-match=bluetooth --action=add
+	eend $?
+}
+
+stop() {
+	return 0
+}