Adding dbus 0.60 patch resolving bug #114460

(Portage version: 2.1_pre3-r1)

5 files changed, 137 insertions, 2 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index ec1d9c2e01e2..126bf9b1683b 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.61 2006/01/02 07:47:06 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.62 2006/01/04 21:46:16 compnerd Exp $
+
+*bluez-utils-2.22-r1 (04 Jan 2006)
+
+  04 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/bluez-utils-2.22-dbus-0.60.patch, +bluez-utils-2.22-r1.ebuild:
+  Adding revbump for dbus-0.60 patch.  Resolves bug #114460.
 
   02 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   -bluez-utils-2.10-r1.ebuild, -bluez-utils-2.15.ebuild,
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 26bbc6e6dcf6..c9f8ea9f56c3 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,6 +1,7 @@
-MD5 406d858e694c2df20664d0a083cc9a61 ChangeLog 9676
+MD5 65c853f4a9572d2eaf178ee8aade8da4 ChangeLog 9902
 MD5 909705b6dbfe23a99cd6353c2a1a0710 bluez-utils-2.19.ebuild 2897
 MD5 bc6b50744c64a764187e0f446a3233de bluez-utils-2.21.ebuild 2630
+MD5 2bacbe3ab13ea77e189fc649cc9518d5 bluez-utils-2.22-r1.ebuild 2738
 MD5 31ae77e0e67d31710053fec9ed8a9671 bluez-utils-2.22.ebuild 2635
 MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
@@ -12,6 +13,7 @@ MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
 MD5 7a47fa7ef1dc74a77dfb13ed5f96b983 files/bluez-utils-2.21-init.d 3399
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/bluez-utils-2.21-pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/bluez-utils-2.21-pin-helper.sh 49
+MD5 b0d830f3f31316886a42497d632d0ac1 files/bluez-utils-2.22-dbus-0.60.patch 374
 MD5 2844834ee91bf2b0d0cf925c682eef28 files/bluez-utils-2.22-init.d 3399
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/bluez-utils-2.22-pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/bluez-utils-2.22-pin-helper.sh 49
@@ -21,5 +23,6 @@ MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 9
 MD5 5b6549a4300097637d65ab565a6c9535 files/digest-bluez-utils-2.19 68
 MD5 f98d1052bca4dd960f4d92ad331ba348 files/digest-bluez-utils-2.21 68
 MD5 62268482cd2b786b23286eda333562d1 files/digest-bluez-utils-2.22 68
+MD5 62268482cd2b786b23286eda333562d1 files/digest-bluez-utils-2.22-r1 68
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
diff --git a/net-wireless/bluez-utils/bluez-utils-2.22-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.22-r1.ebuild
new file mode 100644
index 000000000000..9106115c61bb
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.22-r1.ebuild
@@ -0,0 +1,114 @@
+# 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.22-r1.ebuild,v 1.1 2006/01/04 21:46:16 compnerd Exp $
+
+inherit eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for using Bluetooth under 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"
+
+RDEPEND="!net-wireless/bluez-pan
+		>=net-wireless/bluez-libs-2.22
+		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 )"
+DEPEND="sys-devel/bison
+		sys-devel/flex
+		>=sys-apps/sed-4
+		${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if has_version '>=sys-apps/dbus-0.60' ; then
+		epatch ${FILESDIR}/${PN}-2.22-dbus-0.60.patch
+	fi
+
+	sed -i \
+		-e "s:^HIDD_ENABLE=.*:HIDD_ENABLE=false:" \
+		-e "s:^HID2HCI_ENABLE=.*:HID2HCI_ENABLE=false:" \
+		${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}/${P}-pin-helper.sh pin-helper
+
+	insinto /etc/bluetooth
+	newins ${FILESDIR}/${P}-pin pin
+	fperms 0600 /etc/bluetooth/pin
+
+	newinitd ${FILESDIR}/${P}-init.d bluetooth
+	newconfd ${S}/scripts/bluetooth.default bluetooth
+
+	# bug #103498
+	if use pcmcia; then
+		fperms 755 /etc/pcmcia/bluetooth
+	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
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.22-dbus-0.60.patch b/net-wireless/bluez-utils/files/bluez-utils-2.22-dbus-0.60.patch
new file mode 100644
index 000000000000..e8e5197f8322
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.22-dbus-0.60.patch
@@ -0,0 +1,11 @@
+--- hcid/dbus.c	2005-12-04 12:37:24.000000000 -0600
++++ hcid/dbus.c	2005-12-04 12:37:41.000000000 -0600
+@@ -827,7 +827,7 @@
+ 	}
+ 
+ 	dbus_bus_request_name(connection, BASE_INTERFACE,
+-				DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error);
++				DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
+ 
+ 	if (dbus_error_is_set(&error)) {
+ 		syslog(LOG_ERR,"Can't get system message bus name: %s\n",
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.22-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.22-r1
new file mode 100644
index 000000000000..1fb83076a700
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.22-r1
@@ -0,0 +1 @@
+MD5 cb5d25f79ff4a744a742070617245ce4 bluez-utils-2.22.tar.gz 545622