Install pcmcia udev rules and the helper to right directories. Fixes bug #178671.

Package-Manager: portage-2.1.2.7

4 files changed, 122 insertions, 8 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 0e98bfafb73e..c433e61258da 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.90 2007/05/12 14:53:28 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.91 2007/05/16 09:51:54 betelgeuse Exp $
+
+*bluez-utils-3.10-r2 (16 May 2007)
+
+  16 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +bluez-utils-3.10-r2.ebuild:
+  Install pcmcia udev rules and the helper to right directories. Fixes bug
+  #178671.
 
   12 May 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml:
   Add Dick Marinus <dm@chello.nl> as a proxy maintainer to metadata.xml.
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index bb3f90703ee2..a8067b23fd33 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -77,14 +77,18 @@ EBUILD bluez-utils-3.10-r1.ebuild 2392 RMD160 9dbcc1acd5c2c242797482fbb2aeba3291
 MD5 1f07f3f3292299049939c78d04698875 bluez-utils-3.10-r1.ebuild 2392
 RMD160 9dbcc1acd5c2c242797482fbb2aeba3291be7ae3 bluez-utils-3.10-r1.ebuild 2392
 SHA256 4334db02a0f00fef6a860b7a5affb856f5efae3e808d2a574540f404c39e4984 bluez-utils-3.10-r1.ebuild 2392
+EBUILD bluez-utils-3.10-r2.ebuild 2526 RMD160 d720d7c220a4eee248f5a534a10e2ba2663c1ec8 SHA1 d275f7db7a9dfe7df650814d06d78371b0fc757f SHA256 530239136f6476d2d13e2993ffe69b1bdb2a925a0c6a4784a53124be1754f734
+MD5 ed4dd5a072d257d18bc381b8e71e28b3 bluez-utils-3.10-r2.ebuild 2526
+RMD160 d720d7c220a4eee248f5a534a10e2ba2663c1ec8 bluez-utils-3.10-r2.ebuild 2526
+SHA256 530239136f6476d2d13e2993ffe69b1bdb2a925a0c6a4784a53124be1754f734 bluez-utils-3.10-r2.ebuild 2526
 EBUILD bluez-utils-3.10.ebuild 2373 RMD160 242e621fad2f7d831d4b51d62c52297f23bc5861 SHA1 d871584fc98fa35f0e2ac406ef1450b34ec16636 SHA256 355ba39e5fe18f477ea14a8d2b0f0cd28f9af5ed17a4b803d3924e59e1bdea1d
 MD5 3d8279ea4a89ebdee83f05af0d770cd7 bluez-utils-3.10.ebuild 2373
 RMD160 242e621fad2f7d831d4b51d62c52297f23bc5861 bluez-utils-3.10.ebuild 2373
 SHA256 355ba39e5fe18f477ea14a8d2b0f0cd28f9af5ed17a4b803d3924e59e1bdea1d bluez-utils-3.10.ebuild 2373
-MISC ChangeLog 14390 RMD160 b1062bdb598eba90d12e01a1143c0c233d2cb494 SHA1 8296cd0ac39740e0110216d6085d971c5b36f598 SHA256 25b3dee2166d20dfdcbc4ede9d7e869ec84c3303c261082abd0d76ad2c0d2935
-MD5 bc7aa5e40279752b6d3cf09c037e52d0 ChangeLog 14390
-RMD160 b1062bdb598eba90d12e01a1143c0c233d2cb494 ChangeLog 14390
-SHA256 25b3dee2166d20dfdcbc4ede9d7e869ec84c3303c261082abd0d76ad2c0d2935 ChangeLog 14390
+MISC ChangeLog 14597 RMD160 f4069ba485195878058d63f368f5a6fd0dfefcc8 SHA1 3a6faab4c55356ef766039c0afb713be5559afa0 SHA256 40750024533b3c79741c331d250bf97ef320cf6b490773dcbf511f1bc5076fb3
+MD5 76ce1bd85591aa635a98813f7c2e65dc ChangeLog 14597
+RMD160 f4069ba485195878058d63f368f5a6fd0dfefcc8 ChangeLog 14597
+SHA256 40750024533b3c79741c331d250bf97ef320cf6b490773dcbf511f1bc5076fb3 ChangeLog 14597
 MISC metadata.xml 379 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd SHA1 243ba54e82b478d5941198402cbaa00badd656d9 SHA256 a104a4d733fb797bc867c3c92090dc716305795aa09441a6b7a4b442ff52e669
 MD5 b996228cd1649e0bf48029de7d85ea6d metadata.xml 379
 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd metadata.xml 379
@@ -104,10 +108,13 @@ SHA256 37e7dcc1f13a26116af761961e867a3d32534d020a743da7246580996f6f89b5 files/di
 MD5 9bece5b58aebefa1b5f205f6365dd9cc files/digest-bluez-utils-3.10-r1 250
 RMD160 c9c68afbcd31e7a223c1c7bc4b4fd964594f8c0f files/digest-bluez-utils-3.10-r1 250
 SHA256 37e7dcc1f13a26116af761961e867a3d32534d020a743da7246580996f6f89b5 files/digest-bluez-utils-3.10-r1 250
+MD5 9bece5b58aebefa1b5f205f6365dd9cc files/digest-bluez-utils-3.10-r2 250
+RMD160 c9c68afbcd31e7a223c1c7bc4b4fd964594f8c0f files/digest-bluez-utils-3.10-r2 250
+SHA256 37e7dcc1f13a26116af761961e867a3d32534d020a743da7246580996f6f89b5 files/digest-bluez-utils-3.10-r2 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGRdTlcxLzpIGCsLQRAq5rAJ9nVTXvlCc198hwuP+eMan0HMKKuQCfWKJ3
-jZA2/zOwN5PVdvwjBrq6dmU=
-=f71N
+iD8DBQFGStRLcxLzpIGCsLQRAtsqAJ9jgss21AAqfCekL6zeT97CC6cifACfUaYH
+sP741xSK98aEPlNnn4enT0k=
+=lJ+e
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-utils/bluez-utils-3.10-r2.ebuild b/net-wireless/bluez-utils/bluez-utils-3.10-r2.ebuild
new file mode 100644
index 000000000000..6c9d8e7936a3
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-3.10-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-3.10-r2.ebuild,v 1.1 2007/05/16 09:51:54 betelgeuse 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 ~sparc ~x86"
+
+IUSE="alsa debug hal usb cups"
+
+DEPEND="app-pda/libopensync
+	>=net-wireless/bluez-libs-3.10
+	hal? ( sys-apps/hal )
+	usb? ( dev-libs/libusb )
+	cups? ( net-print/cups )
+	sys-fs/udev
+	dev-libs/glib
+	sys-apps/dbus"
+
+src_unpack() {
+	unpack ${A}
+	# bundled glib
+	cd "${S}"
+	rm -r eglib/{*.c,*.h}  || die
+}
+
+src_compile() {
+	econf \
+		$(use_enable alsa audio) \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable usb) \
+		$(use_enable cups) \
+		$(use_enable hal) \
+		--enable-glib  \
+		--enable-inotify \
+		--enable-obex \
+		--enable-input \
+		--enable-sync \
+		--enable-hcid \
+		--enable-sdpd \
+		--enable-hidd \
+		--enable-configfiles \
+		--disable-initscripts \
+		--disable-pcmciarules \
+		--enable-bccmd \
+		--enable-avctrl \
+		--enable-hid2hci \
+		--enable-dfutool \
+		--localstatedir=/var \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README || die
+
+	# optional bluetooth utils
+	dosbin tools/hcisecfilter tools/ppporc
+	dobin daemon/passkey-agent
+
+	newinitd "${FILESDIR}/${PN}-3.10-init.d" bluetooth || die
+	newconfd "${S}/scripts/bluetooth.default" bluetooth || die
+
+	# bug #84431
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}/${PN}-2.24-udev.rules" 70-bluetooth.rules || die
+	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
+
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/${PN}-2.24-udev.script" bluetooth.sh || die
+	doexe  "${S}/scripts/bluetooth_serial" || die
+}
+
+pkg_postinst() {
+	udevcontrol reload_rules && udevtrigger
+
+	elog "If you use hidd, add --encrypt to the HIDD_OPTIONS in"
+	elog "/etc/conf.d/bluetooth to secure your connection"
+	elog
+	elog "To use dund you must install net-dialup/ppp"
+	elog ""
+	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
+	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
+	elog "For a password asking program, there is for example"
+	elog "net-wireless/bluez-gnome for gnome and net-wireless/kdebluetooth"
+	elog "for kde."
+}
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-3.10-r2 b/net-wireless/bluez-utils/files/digest-bluez-utils-3.10-r2
new file mode 100644
index 000000000000..1f2a8007cdfe
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-3.10-r2
@@ -0,0 +1,3 @@
+MD5 8ad55638a65cb483cbe2717ef3ea7a01 bluez-utils-3.10.tar.gz 802676
+RMD160 12a0d419535a20be5df5afb65134b13a196bc962 bluez-utils-3.10.tar.gz 802676
+SHA256 37c02eeb26cf59e9252e423c9326beaaff61f25bc5186b7f5ce3faacd6a8bc89 bluez-utils-3.10.tar.gz 802676