rev bump to fix some bugs

11 files changed, 154 insertions, 105 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 06d08eef311b..cb8d20af9de1 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.6 2003/05/21 17:55:37 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.7 2003/09/19 14:52:11 liquidx Exp $
+
+*bluez-utils-2.3-r1 (19 Sep 2003)
+
+  19 Sep 2003; Alastair Tse <liquidx@gentoo.org> bluez-utils-2.1.ebuild,
+  bluez-utils-2.2.ebuild, bluez-utils-2.3-r1.ebuild, metadata.xml:
+  added patch for bluepin, fixed ref to bluepin in hcid.conf, added init
+  scipt, removed mknod for rfcomm (not needed for devfs)
 
   21 May 2003; Peter Johanson <latexer@gentoo.org> bluez-utils-2.3.ebuild:
   Add gtk USE flag for pygtk dependancy. bug #21129
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 818903310a67..ff03c866e897 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,8 +1,8 @@
-MD5 9481e6bcf8584c54d6546d7619c75a2e ChangeLog 1013
-MD5 941b65e4cef0b9ecfd04bd424313f4d6 bluez-utils-2.3-r1.ebuild 1630
+MD5 529f5b8ee5fb6883e53a923b1cc1a398 ChangeLog 1319
+MD5 2919506c01ddfad5d03247b0c4c7d0d4 bluez-utils-2.3-r1.ebuild 1632
 MD5 f7db3b22bfee688d179582ebd6fb0716 bluez-utils-2.3.ebuild 1540
 MD5 23d1ee94cc2fb13eb6dcae0a51b061fa metadata.xml 237
-MD5 83009387f8fe404da4b608ea630d1721 files/bluetooth.rc 1069
-MD5 cf33141c63f9b3b1be49a02d96f7e6a3 files/bluez-utils-2.3-bluepin.patch 493
+MD5 2ab25111499ea25953a1231ba729de51 files/bluetooth.rc 1081
+MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
 MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3 67
 MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3-r1 67
diff --git a/net-wireless/bluez-utils/bluez-utils-2.1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.1.ebuild
deleted file mode 100644
index aa82b5dba257..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.1.ebuild,v 1.3 2003/05/09 16:16:54 latexer Exp $
-
-DESCRIPTION="bluetooth utilities"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="sys-devel/bison
-		sys-devel/flex
-		>=net-wireless/bluez-libs-2.2"
-RDEPEND=">=net-wireless/bluez-libs-2.2"
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-pkg_postinst() {
-	# rfcomm needs some devices created to function properly
-	C=0
-	while [ $C -lt 16 ]; do
-		if [ ! -c /dev/rfcomm$C ]; then
-			mknod -m 666 /dev/rfcomm$C c 216 $C
-		fi
-		C=`expr $C + 1`
-	done
-}
diff --git a/net-wireless/bluez-utils/bluez-utils-2.2.ebuild b/net-wireless/bluez-utils/bluez-utils-2.2.ebuild
deleted file mode 100644
index f0071aab1b63..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.2.ebuild,v 1.2 2003/05/09 16:16:54 latexer Exp $
-
-DESCRIPTION="bluetooth utilities"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="sys-devel/bison
-		sys-devel/flex
-		>=net-wireless/bluez-libs-2.2"
-RDEPEND=">=net-wireless/bluez-libs-2.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix some installation locations
-
-	for dir in rfcomm tools; do
-		mv $dir/Makefile.in ${T}/Makefile.in
-		sed -e "s:\$(prefix)/usr/share/man:\@mandir\@:" \
-			${T}/Makefile.in > $dir/Makefile.in;
-	done
-
-	mv hcid/Makefile.in ${T}/Makefile.in
-	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
-		${T}/Makefile.in > hcid/Makefile.in
-}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-pkg_postinst() {
-	# rfcomm needs some devices created to function properly
-	C=0
-	while [ $C -lt 16 ]; do
-		if [ ! -c /dev/rfcomm$C ]; then
-			mknod -m 666 /dev/rfcomm$C c 216 $C
-		fi
-		C=`expr $C + 1`
-	done
-}
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
new file mode 100644
index 000000000000..229019d7de66
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild,v 1.1 2003/09/19 14:52:11 liquidx Exp $
+
+DESCRIPTION="bluetooth utilities"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gtk"
+RDEPEND=">=net-wireless/bluez-libs-2.4
+		 gtk? ( >=dev-python/pygtk-0.6.11 )"
+		 
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to fix bluepin to use pygtk1
+	epatch ${FILESDIR}/${P}-bluepin.patch
+
+	# Fix some installation locations
+
+	for dir in rfcomm tools; do
+		mv -f $dir/Makefile.in ${T}/Makefile.in
+		sed -e "s:\$(prefix)/usr/share/man:\@mandir\@:" \
+			${T}/Makefile.in > $dir/Makefile.in;
+	done
+
+	mv -f hcid/Makefile.in ${T}/Makefile.in
+	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
+		${T}/Makefile.in > hcid/Makefile.in
+
+	if [ ! `use gtk` ]; then
+		mv -f scripts/Makefile.in ${T}/Makefile.in
+		sed -e "s:= bluepin:= :" \
+			${T}/Makefile.in > scripts/Makefile.in
+	fi
+}
+
+src_compile() {
+	econf
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README
+	
+	sed -e "s:\(pin_helper \)/bin/bluepin:\1/usr/bin/bluepin" \
+		-i ${D}/etc/bluetooth/hcid.conf
+		
+	insinto /etc/init.d
+	newins ${FILESDIR}/bluetooth.rc bluetooth
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "A startup script has been installed in /etc/init.d/bluetooth."
+	einfo "Rfcomm devices are found in /dev/bluetooh/rfcomm/*"
+	einfo ""
+}
diff --git a/net-wireless/bluez-utils/files/bluetooth.rc b/net-wireless/bluez-utils/files/bluetooth.rc
new file mode 100644
index 000000000000..2999010e1023
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluetooth.rc
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/files/bluetooth.rc,v 1.1 2003/09/19 14:52:11 liquidx Exp $
+
+UART_CONF="/etc/bluetooth/uart"
+
+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() {
+	local RETVAL
+   	ebegin "Starting Bluetooth"
+	[ -x /usr/sbin/hcid ] && \
+		start-stop-daemon --start --quiet --exec /usr/sbin/hcid
+	RETVAL=$?		
+	[ $RETVAL -a -x /usr/sbin/sdpd ] && \
+		start-stop-daemon --start --quiet --exec /usr/sbin/sdpd
+	RETVAL=$?
+	start_uarts
+	eend ${RETVAL}
+}
+	
+stop() {
+	local RETVAL
+	ebegin "Shutting down Bluetooth"
+	[ -x /usr/sbin/hcid ] && \
+	  start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+	RETVAL=$?
+	[ -x /usr/sbin/sdpd ] && \
+		start-stop-daemon --stop --quiet --exec /usr/sbin/sdpd
+	RETVAL=$?	
+	stop_uarts
+	eend ${RETVAL}
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.3-bluepin.patch b/net-wireless/bluez-utils/files/bluez-utils-2.3-bluepin.patch
new file mode 100644
index 000000000000..91d40e0faf4d
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.3-bluepin.patch
@@ -0,0 +1,23 @@
+--- bluez-utils-2.3/scripts/bluepin	2003-03-20 05:58:14.000000000 +0000
++++ bluez-utils-2.3/scripts/bluepin	2003-09-19 12:52:33.301301864 +0100
+@@ -30,7 +30,8 @@
+ 
+ # Set X display before initializing GTK
+ set_display()
+-
++import pygtk
++pygtk.require("1.2")
+ from gtk import *
+ 
+ # Dialog Class
+@@ -119,8 +120,8 @@
+ 	mainloop()
+ 	return dlg.result
+ 
+-def main(*args):
+-	if len(sys.argv) < 2:
++def main():
++	if len(sys.argv) < 3:
+ 		print "ERR"
+ 		sys.exit()
+ 	
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.1
deleted file mode 100644
index e40937111093..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad3eedb9f64fe051b21341a154c6c0d7 bluez-utils-2.1.tar.gz 231584
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.2 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.2
deleted file mode 100644
index ac1808165ff0..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b73a9d9d1f5ba56ac0d498b79ae12ebb bluez-utils-2.2.tar.gz 244857
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.3-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.3-r1
new file mode 100644
index 000000000000..85892b8ab04f
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.3-r1
@@ -0,0 +1 @@
+MD5 dcc22cb0b24debd5e65f9234d9ba7685 bluez-utils-2.3.tar.gz 247775
diff --git a/net-wireless/bluez-utils/metadata.xml b/net-wireless/bluez-utils/metadata.xml
new file mode 100644
index 000000000000..54d1207d6825
--- /dev/null
+++ b/net-wireless/bluez-utils/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>wireless</herd>
+<herd>pda</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
+</pkgmetadata>