removing bluez-pin from bluez-utils dependencies because it now has NOTHING to do with bluez-utils. Since 3.0, bluez-utils has gone passkey, and therefore it is blocking on some user friendly dbus compat passkey pin entry.

svn path=/; revision=36

7 files changed, 214 insertions, 16 deletions

diff --git a/net-wireless/bluez-libs/bluez-libs-3.2.ebuild b/net-wireless/bluez-libs/bluez-libs-3.2.ebuild
index f3ebc86..0792bbb 100644
--- a/net-wireless/bluez-libs/bluez-libs-3.2.ebuild
+++ b/net-wireless/bluez-libs/bluez-libs-3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-libs/bluez-libs-2.25.ebuild,v 1.4 2006/07/06 06:29:52 corsair Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Bluetooth Userspace Libraries"
 HOMEPAGE="http://bluez.sourceforge.net/"
@@ -19,4 +19,8 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog README
+
+	# http://article.gmane.org/gmane.linux.bluez.announce/57
+	# Although library major number changed, API is compatible.
+	ln -s libbluetooth.so.2 ${D}/usr/$(get_libdir)/bluetooth.so.1
 }
diff --git a/net-wireless/bluez-pin/Manifest b/net-wireless/bluez-pin/Manifest
index 9a25767..f201417 100644
--- a/net-wireless/bluez-pin/Manifest
+++ b/net-wireless/bluez-pin/Manifest
@@ -1,8 +1,12 @@
+AUX 0.30-debian.patch 741 RMD160 07fd3a0c48f7770b20a7486f5beeab3dd9334aaa SHA1 0b8e148d01126242793c7d08e4df082ed1bfac74 SHA256 c80066cbaf04c257e9f2f893d7c0557e552fd038842a70aea59919e983c2f872
+MD5 a1ac0fe8a39a38074330f3b699036fff files/0.30-debian.patch 741
+RMD160 07fd3a0c48f7770b20a7486f5beeab3dd9334aaa files/0.30-debian.patch 741
+SHA256 c80066cbaf04c257e9f2f893d7c0557e552fd038842a70aea59919e983c2f872 files/0.30-debian.patch 741
 DIST bluez-pin-0.30.tar.bz2 107530 RMD160 16cdfdd96de7f4eb162f563bee7aa6692a3935cb SHA1 f17416a5b56fca8b0008ff4ce642381308ffd0dd SHA256 8216bc76eef0b536b218474a5c62fd638468bd9e51c2a8d707dc10c508123b0d
-EBUILD bluez-pin-0.30.ebuild 515 RMD160 40d0729ab0560c11143d420613a021ac50c18b55 SHA1 e501a434163352bf905944a3294700004f96f050 SHA256 d55f0013802a65e23edf28ecc0b6caef25948e96124834aec468a5a36b435f09
-MD5 190417784ab414d5a62b41c11b5c5010 bluez-pin-0.30.ebuild 515
-RMD160 40d0729ab0560c11143d420613a021ac50c18b55 bluez-pin-0.30.ebuild 515
-SHA256 d55f0013802a65e23edf28ecc0b6caef25948e96124834aec468a5a36b435f09 bluez-pin-0.30.ebuild 515
+EBUILD bluez-pin-0.30.ebuild 593 RMD160 efc2ed07e6c05c6c2a205054c3bbb970a3593030 SHA1 359cbdf70a1d525beb3aa2bf24a5c4167e2303a1 SHA256 3388d29d2b224548ec741b98b5354d5f353660cefac7d3e8b5aedd6b1842a2a6
+MD5 54bddb6583f1f3a698b867a5d1ff6c44 bluez-pin-0.30.ebuild 593
+RMD160 efc2ed07e6c05c6c2a205054c3bbb970a3593030 bluez-pin-0.30.ebuild 593
+SHA256 3388d29d2b224548ec741b98b5354d5f353660cefac7d3e8b5aedd6b1842a2a6 bluez-pin-0.30.ebuild 593
 MD5 5e08cd837bc9a514f36d190a6d480b99 files/digest-bluez-pin-0.30 247
 RMD160 d69d03b78c2f718cf1b3af689f225ea86b76b4ea files/digest-bluez-pin-0.30 247
 SHA256 1541610ebeabffb55455e256eabd79562770d1a89c3947efed55942cb8e42c5b files/digest-bluez-pin-0.30 247
diff --git a/net-wireless/bluez-pin/bluez-pin-0.30.ebuild b/net-wireless/bluez-pin/bluez-pin-0.30.ebuild
index 79ee0bd..74ed5f0 100644
--- a/net-wireless/bluez-pin/bluez-pin-0.30.ebuild
+++ b/net-wireless/bluez-pin/bluez-pin-0.30.ebuild
@@ -13,9 +13,15 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2.0
-    >=sys-apps/dbus-0.62
+    >=sys-apps/dbus-0.61
     >=net-wireless/bluez-libs-3.0
     >=gnome-base/gconf-2.0
     >=gnome-base/libglade-2.0"
 
 S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-debian.patch
+}
\ No newline at end of file
diff --git a/net-wireless/bluez-pin/files/0.30-debian.patch b/net-wireless/bluez-pin/files/0.30-debian.patch
new file mode 100644
index 0000000..14d2677
--- /dev/null
+++ b/net-wireless/bluez-pin/files/0.30-debian.patch
@@ -0,0 +1,26 @@
+--- bluez-pin-0.30.orig/pin-dbus.c
++++ bluez-pin-0.30/pin-dbus.c
+@@ -71,8 +71,8 @@
+ DBusHandlerResult
+ bluez_pin_handle_dbus_request (DBusConnection *connection, DBusMessage *message)
+ {
+-  DBusMessageIter iter;
+-  gboolean out;
++  DBusMessageIter iter, aiter;
++  dbus_bool_t out;
+   bdaddr_t bdaddr, sbdaddr;
+   int type;
+   char *address;
+@@ -109,8 +109,10 @@
+ 
+ #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+   nbytes = 0;
+-  if (type == DBUS_TYPE_ARRAY)
+-    dbus_message_iter_get_fixed_array (&iter, &bytes, &nbytes);
++  if (type == DBUS_TYPE_ARRAY) {
++    dbus_message_iter_recurse(&iter, &aiter);
++    dbus_message_iter_get_fixed_array (&aiter, &bytes, &nbytes);
++  }
+   if (nbytes != sizeof (bdaddr))
+ #else
+   if (type != DBUS_TYPE_ARRAY
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 8db3d68..f4e907c 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -6,11 +6,23 @@ AUX bluez-utils-2.24-udev.script 572 RMD160 f4ba713c996ba96cc6fed889029cf3b77415
 MD5 df945b8dc13a93cbbef19d118ef645d7 files/bluez-utils-2.24-udev.script 572
 RMD160 f4ba713c996ba96cc6fed889029cf3b7741533c8 files/bluez-utils-2.24-udev.script 572
 SHA256 b5064a5e7f6d5de189316e9402e6dcf074e84b4f46b8b0b50c44790028f307a2 files/bluez-utils-2.24-udev.script 572
+AUX bluez-utils-2.25-init.d 3403 RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d SHA1 6a64d0cfff048769471fe90faeaca58aaabe66c6 SHA256 2203689b54384cbe7134999fc5ba87120090ff3e2acd15f76f142741b15a10eb
+MD5 105cd874b29ee69bd26a0c01d91cb9a9 files/bluez-utils-2.25-init.d 3403
+RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d files/bluez-utils-2.25-init.d 3403
+SHA256 2203689b54384cbe7134999fc5ba87120090ff3e2acd15f76f142741b15a10eb files/bluez-utils-2.25-init.d 3403
+AUX bluez-utils-3.2-init.d 3412 RMD160 603b5452c80027e4f85d2edf6da1dd8e94891acb SHA1 5bb9c47406cbec139270d14e359b0721991b7036 SHA256 8d67a0062e466e11c6669cce5c700ad527697d3991ed553aa5956dc76b3469d1
+MD5 e822dd6afb73d5fdbb4ecab874b23333 files/bluez-utils-3.2-init.d 3412
+RMD160 603b5452c80027e4f85d2edf6da1dd8e94891acb files/bluez-utils-3.2-init.d 3412
+SHA256 8d67a0062e466e11c6669cce5c700ad527697d3991ed553aa5956dc76b3469d1 files/bluez-utils-3.2-init.d 3412
+AUX bluez-utils-3.2-init.d~ 3403 RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d SHA1 6a64d0cfff048769471fe90faeaca58aaabe66c6 SHA256 2203689b54384cbe7134999fc5ba87120090ff3e2acd15f76f142741b15a10eb
+MD5 105cd874b29ee69bd26a0c01d91cb9a9 files/bluez-utils-3.2-init.d~ 3403
+RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d files/bluez-utils-3.2-init.d~ 3403
+SHA256 2203689b54384cbe7134999fc5ba87120090ff3e2acd15f76f142741b15a10eb files/bluez-utils-3.2-init.d~ 3403
 DIST bluez-utils-3.2.tar.gz 608848 RMD160 ac6cd61bf2d0b529338bdd8538ffbbad0cb7cb9a SHA1 a2fb018724d70cd9e1a77e76a38101b80ac2e71a SHA256 f9058f9e8d3910cebbb3524d667ec901809c6716a6fd9baf613576217f0a6b58
-EBUILD bluez-utils-3.2.ebuild 2414 RMD160 39b653abd43fac848bf36a631561fe4eb66eedf1 SHA1 69556b16f1c7ab920aa5bfbcaeba269ea105457b SHA256 e8bcd766cb1417f3a1898f0c326f966d3fc6447e0153f0e6d0830605e656dfd9
-MD5 4bacbaec13a782b92514339c752b7e56 bluez-utils-3.2.ebuild 2414
-RMD160 39b653abd43fac848bf36a631561fe4eb66eedf1 bluez-utils-3.2.ebuild 2414
-SHA256 e8bcd766cb1417f3a1898f0c326f966d3fc6447e0153f0e6d0830605e656dfd9 bluez-utils-3.2.ebuild 2414
+EBUILD bluez-utils-3.2.ebuild 2579 RMD160 d29314699f01773b31d75c8bd6b0dcb4420d469f SHA1 2494a0bd6b4b462c417213cd18c0397f3351d9fc SHA256 f66e2e70dfa0eec29d6ddd029420912332864a98b63ac1532ddeab1d641a5f74
+MD5 7016b0827b14ee017680c22686b412e5 bluez-utils-3.2.ebuild 2579
+RMD160 d29314699f01773b31d75c8bd6b0dcb4420d469f bluez-utils-3.2.ebuild 2579
+SHA256 f66e2e70dfa0eec29d6ddd029420912332864a98b63ac1532ddeab1d641a5f74 bluez-utils-3.2.ebuild 2579
 MD5 5a31772064e0e402e9f5c0ea5286796f files/digest-bluez-utils-3.2 247
 RMD160 3be3fb6f7a1683a551f39179839cfbc5c0d88f51 files/digest-bluez-utils-3.2 247
 SHA256 09c1dab2039e290f9100ef4148cd3db360a81588953a4cf46129f7c3033fad46 files/digest-bluez-utils-3.2 247
diff --git a/net-wireless/bluez-utils/bluez-utils-3.2.ebuild b/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
index d8b5c1c..1fa7219 100644
--- a/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
@@ -16,7 +16,6 @@ IUSE="alsa cups fuse udev"
 
 RDEPEND="!net-wireless/bluez-pan
 		>=net-wireless/bluez-libs-3.2
-		>=net-wireless/bluez-pin-0.30
 		>=sys-apps/dbus-0.31
 		dev-libs/libusb
 		>=dev-libs/openobex-1.2
@@ -30,6 +29,12 @@ DEPEND="sys-devel/bison
 		>=sys-apps/sed-4
 		${RDEPEND}"
 
+pkg_setup() {
+	ewarn "This verison of Bluez does not include a GTK pin entry, but"
+	ewarn "instead you have to use the temporary passkey-agent, eg:"
+	ewarn "/usr/bin/passkey-agent --default <pin number>"
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -55,7 +60,6 @@ src_compile() {
 		$(use_enable cups) \
 		$(use_enable fuse) \
 		--enable-dbus \
-		--enable-bccmd \
 		--enable-avctrl \
 		--enable-bcm203x \
 		--enable-dfutool \
@@ -74,11 +78,11 @@ src_install() {
 	dodoc AUTHORS ChangeLog README
 
 	# optional bluetooth utils
-	#cd ${S}/tools
-	#dosbin bccmd hcisecfilter ppporc pskey
+	dosbin tools/hcisecfilter tools/ppporc 
+	dobin hcid/passkey-agent
 
-	#newinitd ${FILESDIR}/${PN}-2.25-init.d bluetooth
-	#newconfd ${S}/scripts/bluetooth.default bluetooth
+	newinitd ${FILESDIR}/${PN}-2.25-init.d bluetooth
+	newconfd ${S}/scripts/bluetooth.default bluetooth
 
 	# bug #84431
 	if use udev; then
@@ -88,6 +92,7 @@ src_install() {
 		exeinto /lib/udev/
 		newexe ${FILESDIR}/${PN}-2.24-udev.script bluetooth.sh
 	fi
+
 }
 
 pkg_postinst() {
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d b/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d
new file mode 100644
index 0000000..30105f0
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d
@@ -0,0 +1,141 @@
+#!/sbin/runscript
+# 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/files/bluez-utils-2.25-init.d,v 1.1 2006/02/07 14:04:40 liquidx Exp $
+
+UART_CONF="/etc/bluetooth/uart"
+
+depend() {
+	after coldplug
+	after dbus
+}
+
+start_uarts() {
+	[ -f /usr/sbin/hciattach -a -f ${UART_CONF} ] || return
+	grep -v '^#' ${UART_CONF} | while read i; do
+		/usr/sbin/hciattach $i
+	done
+}
+
+stop_uarts() {
+	killall hciattach > /dev/null 2>&1
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci -0 -q    #be quiet
+		/bin/sleep 1 # delay for hid's to be detected by hotplug
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		if [ -f "${HCID_CONFIG}" ]; then
+			ebegin "    Starting hcid"
+			start-stop-daemon --start --quiet \
+				--exec /usr/sbin/hcid -- -f $HCID_CONFIG
+			eend $?
+	    else
+			ewarn "Not enabling hcid because HCID_CONFIG is missing."
+	    fi
+	fi
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Starting sdpd"
+		start-stop-daemon --start --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Starting hidd"
+		start-stop-daemon --start --quiet \
+			--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			ebegin "    Starting rfcomm"
+			/usr/bin/rfcomm -f ${RFCOMM_CONFIG} bind all
+			eend $?
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		if [ -n "${DUND_OPTIONS}" ]; then
+			ebegin "    Starting dund"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/dund -- ${DUND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting dund because DUND_OPTIONS not defined."
+		fi
+	fi
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		if [ -n "${PAND_OPTIONS}" ]; then
+			ebegin "    Starting pand"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/pand -- ${PAND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting pand because PAND_OPTIONS not defined."
+		fi
+	fi
+
+	start_uarts
+	eend 0
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		ebegin "    Stopping pand"
+		start-stop-daemon --stop --quiet --exec /usr/bin/pand
+		eend $?
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		ebegin "    Stopping dund"
+		start-stop-daemon --stop --quiet --exec /usr/bin/dund
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		ebegin "    Stopping rfcomm"
+		/usr/bin/rfcomm release all
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Stopping hidd"
+		start-stop-daemon --stop --quiet --exec /usr/bin/hidd
+		eend $?
+	fi
+
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Stopping sdpd"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		ebegin "    Stopping hcid"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+		eend $?
+	fi
+
+	stop_uarts
+	eend 0
+}
+
+restart() {
+	svc_stop
+	svc_start
+}