version bump. added CSR-specific development tools (pskey,bccmd,dfutool). changed dbus dependency.

(Portage version: 2.0.51.22-r1)

10 files changed, 37 insertions, 215 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 7ff83c07e0af..0d3af0d02380 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.47 2005/06/26 08:14:32 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.48 2005/07/06 10:34:15 liquidx Exp $
+
+*bluez-utils-2.18 (06 Jul 2005)
+
+  06 Jul 2005; Alastair Tse <liquidx@gentoo.org> +bluez-utils-2.18.ebuild:
+  version bump. added CSR-specific development tools (pskey,bccmd,dfutool).
+  changed dbus dependency.
 
   26 Jun 2005; <brix@gentoo.org> bluez-utils-2.17.ebuild,
   bluez-utils-2.17-r1.ebuild:
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 1a10817e54d2..d2bded013e74 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,27 +1,29 @@
-MD5 41d1a414d0d3dd2546142c9fce7cac0d bluez-utils-2.17.ebuild 2731
-MD5 4da0ad67818e730edd5337a4a16c899a bluez-utils-2.12.ebuild 2189
+MD5 34d7d7d9e3adb4ed4a6c7b4b04829d1e ChangeLog 7477
 MD5 b049b8c4d26d949b96515f79c805084c bluez-utils-2.10-r1.ebuild 2591
-MD5 fae0faf827fe38276b05aedaebb1adf6 bluez-utils-2.17-r1.ebuild 2734
-MD5 946214b26fff463e76269c42340b77d2 bluez-utils-2.16.ebuild 2683
-MD5 5fb15e85a2a314a3177e67893e720933 bluez-utils-2.16-r1.ebuild 2682
+MD5 4da0ad67818e730edd5337a4a16c899a bluez-utils-2.12.ebuild 2189
 MD5 8956170e0d15f46fb0885c977f11126f bluez-utils-2.15.ebuild 2482
-MD5 34d7d7d9e3adb4ed4a6c7b4b04829d1e ChangeLog 7477
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
+MD5 946214b26fff463e76269c42340b77d2 bluez-utils-2.16.ebuild 2683
+MD5 5fb15e85a2a314a3177e67893e720933 bluez-utils-2.16-r1.ebuild 2682
+MD5 41d1a414d0d3dd2546142c9fce7cac0d bluez-utils-2.17.ebuild 2731
+MD5 fae0faf827fe38276b05aedaebb1adf6 bluez-utils-2.17-r1.ebuild 2734
+MD5 58e5f57eb48f6779d947ccdb5265ef21 bluez-utils-2.18.ebuild 2734
+MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
 MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
-MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
-MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
 MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295
+MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
+MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
 MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10-r1 68
-MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68
-MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17-r1 68
-MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355
 MD5 461e23b79c054101bd79fdb85755a864 files/digest-bluez-utils-2.12 68
 MD5 7b0985abd13b5bbc75fe58e206372a65 files/digest-bluez-utils-2.15 68
+MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
 MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16 68
+MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355
+MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68
 MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17 68
-MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
-MD5 8640fa9eafee8ea600121af7792b7ad9 files/2.16/bluetooth.rc 3396
+MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17-r1 68
+MD5 7300259b4a7fdd010164c37004269877 files/digest-bluez-utils-2.18 68
+MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49
-MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
+MD5 8640fa9eafee8ea600121af7792b7ad9 files/2.16/bluetooth.rc 3396
diff --git a/net-wireless/bluez-utils/bluez-utils-2.12.ebuild b/net-wireless/bluez-utils/bluez-utils-2.12.ebuild
deleted file mode 100644
index 0bb46a48b6bc..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.12.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 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.12.ebuild,v 1.2 2005/05/14 11:58:53 gmsoft Exp $
-
-IUSE="gtk"
-
-inherit eutils
-
-DESCRIPTION="bluetooth utilities"
-HOMEPAGE="http://bluez.sourceforge.net/"
-SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=net-wireless/bluez-libs-2.12
-	!net-wireless/bluez-pan
-	gtk? ( >=dev-python/pygtk-2.2 )
-	dev-libs/libusb"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	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 || die "econf failed"
-	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 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-helper;:" \
-			-i ${D}/etc/bluetooth/hcid.conf
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/2.10-r1/bluetooth.rc bluetooth
-
-	exeinto /etc/bluetooth
-	newexe ${FILESDIR}/2.10-r1/pin-helper.sh pin-helper
-	insinto /etc/bluetooth
-	newins ${FILESDIR}/2.10-r1/pin pin
-	fperms 0600 /etc/bluetooth/pin
-
-	insinto /etc/conf.d
-	newins ${S}/scripts/bluetooth.default bluetooth
-	sed -i -e 's/^HIDD_ENABLE=.*/HIDD_ENABLE=false/' \
-		-e 's/^HID2HCI_ENABLE=.*/HID2HCI_ENABLE=false/' \
-		${D}/etc/conf.d/bluetooth
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "A startup script has been installed in /etc/init.d/bluetooth."
-	einfo "RFComm devices are found in /dev/bluetooth/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-helper."
-
-	if 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/bluez-utils-2.16.ebuild b/net-wireless/bluez-utils/bluez-utils-2.16.ebuild
deleted file mode 100644
index 7e819ff1aa86..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.16.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 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.16.ebuild,v 1.2 2005/05/09 11:30:57 liquidx Exp $
-
-IUSE="gtk alsa cups pcmcia dbus"
-
-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 ~ppc ~sparc ~x86"
-
-RDEPEND=">=net-wireless/bluez-libs-2.16
-	!net-wireless/bluez-pan
-	dev-libs/libusb
-	gtk? ( >=dev-python/pygtk-2.2 )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	dbus? ( =sys-apps/dbus-0.23* )
-	pcmcia? ( sys-apps/pcmcia-cs sys-apps/setserial )"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	>=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if ! use gtk; then
-		mv -f scripts/Makefile.in ${T}/Makefile.in
-		sed -e "s:= bluepin:= :" \
-			${T}/Makefile.in > scripts/Makefile.in
-	fi
-	cd ${S}/scripts
-	epatch ${FILESDIR}/2.15-bluepin.patch
-}
-
-src_compile() {
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable alsa) \
-		$(use_enable pcmcia) \
-		$(use_enable gtk bluepin) \
-		$(use_enable dbus) \
-		--enable-usb \
-		--disable-initscripts \
-		--enable-obex \
-		--enable-hid2hci \
-		--enable-bcm203x
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README
-
-	sed -e "s:security auto;:security user;:" \
-		-i ${D}/etc/bluetooth/hcid.conf
-
-	if 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-helper;:" \
-			-i ${D}/etc/bluetooth/hcid.conf
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/2.16/bluetooth.rc bluetooth
-
-	exeinto /etc/bluetooth
-	newexe ${FILESDIR}/2.10-r1/pin-helper.sh pin-helper
-	insinto /etc/bluetooth
-	newins ${FILESDIR}/2.10-r1/pin pin
-	fperms 0600 /etc/bluetooth/pin
-
-	insinto /etc/conf.d
-	newins ${S}/scripts/bluetooth.default bluetooth
-	sed -i -e 's/^HIDD_ENABLE=.*/HIDD_ENABLE=false/' \
-		-e 's/^HID2HCI_ENABLE=.*/HID2HCI_ENABLE=false/' \
-		${D}/etc/conf.d/bluetooth
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "A startup script has been installed in /etc/init.d/bluetooth."
-	einfo "RFComm devices are found in /dev/bluetooth/rfcomm/* instead of /dev/rfcomm*"
-	echo
-	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."
-	echo
-
-	if 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/bluez-utils-2.17-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild
index 29abde6dfd8c..d1906067311f 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.17-r1.ebuild,v 1.2 2005/06/26 08:14:32 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild,v 1.3 2005/07/06 10:34:15 liquidx Exp $
 
 IUSE="gtk alsa cups pcmcia dbus"
 
@@ -12,7 +12,7 @@ SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 RDEPEND=">=net-wireless/bluez-libs-2.17
 	!net-wireless/bluez-pan
diff --git a/net-wireless/bluez-utils/bluez-utils-2.17.ebuild b/net-wireless/bluez-utils/bluez-utils-2.18.ebuild
index c156072287ab..b7b3f7651fd5 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.17.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.17.ebuild,v 1.3 2005/06/26 08:14:32 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.18.ebuild,v 1.1 2005/07/06 10:34:15 liquidx Exp $
 
 IUSE="gtk alsa cups pcmcia dbus"
 
@@ -14,13 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND=">=net-wireless/bluez-libs-2.17
+RDEPEND=">=net-wireless/bluez-libs-2.18
 	!net-wireless/bluez-pan
 	dev-libs/libusb
 	gtk? ( >=dev-python/pygtk-2.2 )
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	dbus? ( =sys-apps/dbus-0.23* )
+	dbus? ( >=sys-apps/dbus-0.23 )
 	pcmcia? ( sys-apps/pcmcia-cs sys-apps/setserial )"
 
 DEPEND="sys-devel/bison
@@ -53,6 +53,8 @@ src_compile() {
 		--enable-obex \
 		--enable-hid2hci \
 		--enable-bcm203x \
+		--enable-avctrl \
+		--enable-dfutool \
 		--localstatedir=/var \
 		|| die "econf failed"
 	emake || die "make failed"
@@ -60,7 +62,11 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc README
+	dodoc README ChangeLog
+	# optional bluetooth utils
+	cd ${S}/tools
+	dosbin hcisecfilter ppporc pskey bccmd
+	cd ${S}
 
 	sed -e "s:security auto;:security user;:" \
 		-i ${D}/etc/bluetooth/hcid.conf
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.12 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.12
deleted file mode 100644
index eae936205c65..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20aeda4b1b6176cc178b0152ff736516 bluez-utils-2.12.tar.gz 296613
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.16 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.16
deleted file mode 100644
index 7cbe12d62273..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1d5364723109a978801d155d1f4da1e bluez-utils-2.16.tar.gz 471966
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.17 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.17
deleted file mode 100644
index 91c9a6d166cf..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42be19b0029a83824358baa0106da947 bluez-utils-2.17.tar.gz 488141
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.18 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.18
new file mode 100644
index 000000000000..cbe74a44051d
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.18
@@ -0,0 +1 @@
+MD5 9c6a20f96971833a8fee3877158f175f bluez-utils-2.18.tar.gz 494205