diff options
-rw-r--r-- | net-wireless/bluez/ChangeLog | 10 | ||||
-rw-r--r-- | net-wireless/bluez/bluez-4.101-r1.ebuild (renamed from net-wireless/bluez/bluez-4.101.ebuild) | 9 | ||||
-rw-r--r-- | net-wireless/bluez/files/bluetooth-init.d-r2 | 21 |
3 files changed, 34 insertions, 6 deletions
diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog index bc8697fec86f..2c9195152c7c 100644 --- a/net-wireless/bluez/ChangeLog +++ b/net-wireless/bluez/ChangeLog @@ -1,6 +1,14 @@ # 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.138 2012/07/06 12:29:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.139 2012/07/06 18:41:14 pacho Exp $ + +*bluez-4.101-r1 (06 Jul 2012) + + 06 Jul 2012; Pacho Ramos <pacho@gentoo.org> +bluez-4.101-r1.ebuild, + +files/bluetooth-init.d-r2, -bluez-4.101.ebuild: + Recover bluetoothd init.d script to start it now that upstream has decided to + drop udev rule (bug #423513 by Nikolay S. Rybaloff, Marcin Deranek and + others). 06 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> bluez-4.98-r2.ebuild, bluez-4.99.ebuild, bluez-4.101.ebuild: diff --git a/net-wireless/bluez/bluez-4.101.ebuild b/net-wireless/bluez/bluez-4.101-r1.ebuild index 18b74b805bab..e1c6e121ea20 100644 --- a/net-wireless/bluez/bluez-4.101.ebuild +++ b/net-wireless/bluez/bluez-4.101-r1.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.101.ebuild,v 1.3 2012/07/06 12:29:54 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r1.ebuild,v 1.1 2012/07/06 18:41:14 pacho Exp $ EAPI="4" PYTHON_DEPEND="test-programs? 2" @@ -136,7 +136,7 @@ src_install() { network/network.conf \ serial/serial.conf - newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth + newinitd "${FILESDIR}/bluetooth-init.d-r2" bluetooth newinitd "${FILESDIR}/rfcomm-init.d" rfcomm newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm @@ -148,7 +148,7 @@ src_install() { } pkg_postinst() { - udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth + udevadm control --reload-rules if ! has_version "net-dialup/ppp"; then elog "To use dial up networking you must install net-dialup/ppp." @@ -166,8 +166,7 @@ pkg_postinst() { 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 "for getting your devices detected. For that please run:" elog "'rc-update add bluetooth default'" fi } diff --git a/net-wireless/bluez/files/bluetooth-init.d-r2 b/net-wireless/bluez/files/bluetooth-init.d-r2 new file mode 100644 index 000000000000..7328cd247c32 --- /dev/null +++ b/net-wireless/bluez/files/bluetooth-init.d-r2 @@ -0,0 +1,21 @@ +#!/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-r2,v 1.1 2012/07/06 18:41:14 pacho Exp $ + +depend() { + after coldplug + need dbus localmount hostname +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec /usr/sbin/bluetoothd + eend $? +} + +stop() { + ebegin "Shutting down ${SVCNAME}" + start-stop-daemon --stop --quiet --exec /usr/sbin/bluetoothd + eend $? +} |