Modify bluetooth init script to need dbus when compiled with dbus support.

(Portage version: 2.1_rc1-r2)

5 files changed, 144 insertions, 1 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 9ef89a0839eb..0bd6af481acd 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.72 2006/03/14 23:33:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.73 2006/05/15 11:25:32 uberlord Exp $
+
+*bluez-utils-2.25-r1 (15 May 2006)
+
+  15 May 2006; Roy Marples <uberlord@gentoo.org>
+  +bluez-utils-2.25-r1.ebuild:
+  Modify bluetooth init script to need dbus when compiled with dbus support.
 
   14 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   bluez-utils-2.24.ebuild:
diff --git a/net-wireless/bluez-utils/bluez-utils-2.25-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.25-r1.ebuild
new file mode 100644
index 000000000000..9d9f9d5df2a9
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.25-r1.ebuild
@@ -0,0 +1,130 @@
+# 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-r1.ebuild,v 1.1 2006/05/15 11:25:32 uberlord 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
+
+	# If we are compiled with dbus support then we kinda need it
+	if use dbus ; then
+		sed -i 's/after dbus/need dbus/g' "${D}"/etc/init.d/bluetooth
+	fi
+
+	# 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/digest-bluez-utils-2.24 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.24
index a3d2261d8d50..3ef169404bb3 100644
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.24
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.24
@@ -1 +1,3 @@
 MD5 5f5488ff3d31bdb9cd36b7991fe68408 bluez-utils-2.24.tar.gz 585401
+RMD160 b1aa8cee2ce8cafb08312e1da2e2be908ed1ac22 bluez-utils-2.24.tar.gz 585401
+SHA256 06290c2d6b05d8f6736038c86fe12bb63f6661dcbf95563a531b93085503c991 bluez-utils-2.24.tar.gz 585401
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.25 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.25
index ac0e4e5e6214..576222260130 100644
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.25
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.25
@@ -1 +1,3 @@
 MD5 ae3729ab5592be06ed01b973d4b3e9fe bluez-utils-2.25.tar.gz 592073
+RMD160 ec28db230c8f612f799dc7ca4e77480093e8c8f3 bluez-utils-2.25.tar.gz 592073
+SHA256 dce533631ddba65044293f6fb5ee429232c1a8bf0146e0b7af89add348d0fc3f bluez-utils-2.25.tar.gz 592073
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.25-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.25-r1
new file mode 100644
index 000000000000..576222260130
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.25-r1
@@ -0,0 +1,3 @@
+MD5 ae3729ab5592be06ed01b973d4b3e9fe bluez-utils-2.25.tar.gz 592073
+RMD160 ec28db230c8f612f799dc7ca4e77480093e8c8f3 bluez-utils-2.25.tar.gz 592073
+SHA256 dce533631ddba65044293f6fb5ee429232c1a8bf0146e0b7af89add348d0fc3f bluez-utils-2.25.tar.gz 592073