version bump (#44589). removed gtk1 option as bluepin has been revamped

4 files changed, 94 insertions, 3 deletions

diff --git a/net-wireless/bluez-hcidump/Manifest b/net-wireless/bluez-hcidump/Manifest
index c95af57bbfd9..c2855128618c 100644
--- a/net-wireless/bluez-hcidump/Manifest
+++ b/net-wireless/bluez-hcidump/Manifest
@@ -1,4 +1,6 @@
-MD5 9dde6d2944e4bbe43cc9b35bb4dc75a9 ChangeLog 995
-MD5 db790d532a972aa3109c37a7fc4981cb bluez-hcidump-1.5.ebuild 611
+MD5 a953137390a15b660a31079029e3ace7 bluez-hcidump-1.8.ebuild 617
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
+MD5 db790d532a972aa3109c37a7fc4981cb bluez-hcidump-1.5.ebuild 611
+MD5 cd6a43c2e24c1baabf890c74909b072e ChangeLog 1120
 MD5 9ac9731893433576225ec15b1e327514 files/digest-bluez-hcidump-1.5 69
+MD5 857c9ff12db458d74004172fd9adc783 files/digest-bluez-hcidump-1.8 69
diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index ee99be4d6304..49391a629487 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.16 2004/02/15 12:39:15 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.17 2004/03/29 02:08:39 liquidx Exp $
+
+*bluez-utils-2.5 (29 Mar 2004)
+
+  29 Mar 2004; Alastair Tse <liquidx@gentoo.org> bluez-utils-2.5.ebuild:
+  version bump (#44589). removed gtk1 option as bluepin has been revamped
 
   15 Feb 2004; David Holm <dholm@gentoo.org> bluez-utils-2.3-r2.ebuild:
   Added to ~ppc.
diff --git a/net-wireless/bluez-utils/bluez-utils-2.5.ebuild b/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
new file mode 100644
index 000000000000..1560216bea1d
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 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.5.ebuild,v 1.1 2004/03/29 02:08:40 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 ~sparc ~ppc"
+IUSE="gtk"
+RDEPEND=">=net-wireless/bluez-libs-2.4
+	gtk? ( >=dev-python/pygtk-2 )"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${PN}-2.3-rfcomm_fflush.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:security auto;:security user;:" \
+		-i ${D}/etc/bluetooth/hcid.conf
+
+	if [ -n "`use gtk`" ]; then
+		sed -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \
+			-i ${D}/etc/bluetooth/hcid.conf
+	else
+		sed -e "s:\(pin_helper \).*:\1/etc/bluetooth/pin;:" \
+			-i ${D}/etc/bluetooth/hcid.conf
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bluetooth.rc bluetooth
+
+	exeinto /etc/bluetooth
+	newexe ${FILESDIR}/pin.sample pin
+	fperms 0700 /etc/bluetooth/pin
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "A startup script has been installed in /etc/init.d/bluetooth."
+	einfo "RFComm devices are found in /dev/bluetooh/rfcomm/* instead of /dev/rfcomm*"
+	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."
+	if [ -n "`use gtk`" ]; then
+		einfo "By default, /usr/bin/bluepin will be launched on the desktop display"
+		einfo "for pin number input."
+	fi
+	einfo ""
+}
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.5 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.5
new file mode 100644
index 000000000000..30ca9d9dfd2d
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.5
@@ -0,0 +1 @@
+MD5 425b877a4daf2ff3d8b2693116287db7 bluez-utils-2.5.tar.gz 216466