Pruning and masking dbus 0.60 as cardoe is unmasking

(Portage version: 2.1_pre3-r1)

15 files changed, 34 insertions, 563 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index c7634100ab27..ec1d9c2e01e2 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.60 2005/12/17 13:08:39 gmsoft Exp $
+# 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 $
+
+  02 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  -bluez-utils-2.10-r1.ebuild, -bluez-utils-2.15.ebuild,
+  -bluez-utils-2.16-r1.ebuild, -bluez-utils-2.17-r1.ebuild,
+  -bluez-utils-2.18.ebuild, bluez-utils-2.19.ebuild,
+  bluez-utils-2.21.ebuild, bluez-utils-2.22.ebuild:
+  Pruning old ebuilds; Masking dbus 0.60 as Cardoe is unmasking
 
   17 Dec 2005; Guy Martin <gmsoft@gentoo.org> bluez-utils-2.22.ebuild:
   Stable on hppa.
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 70074ac0ced9..fead96f5c611 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,35 +1,25 @@
-MD5 c25530f29f39841723994149054bfedc ChangeLog 9331
-MD5 b049b8c4d26d949b96515f79c805084c bluez-utils-2.10-r1.ebuild 2591
-MD5 e5e21f985e130805eefe32a4e72f2412 bluez-utils-2.18.ebuild 2873
-MD5 586132a6bb409ecbfce3c0ff6b44c201 bluez-utils-2.19.ebuild 2875
-MD5 b8902fd2efa31a57e83025541cddca86 bluez-utils-2.15.ebuild 2511
-MD5 5fb15e85a2a314a3177e67893e720933 bluez-utils-2.16-r1.ebuild 2682
-MD5 ff742ef37bcc2ed6776dc07f2cf19d5b bluez-utils-2.21.ebuild 2604
-MD5 17193894aa038f809e44e7f66c85a853 bluez-utils-2.22.ebuild 2611
-MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 b89a3826074ef2159ebbce5317d1c338 bluez-utils-2.17-r1.ebuild 2735
+MD5 82581a294bff4d28dfe596047e441f78 ChangeLog 9674
+MD5 92b153947741ffc7b35c75c4fc6d3b22 bluez-utils-2.19.ebuild 2897
+MD5 61ea24a25fc451d87548560e4163f207 bluez-utils-2.21.ebuild 2626
+MD5 3f0950df6937ee2c0299e6134ed8f7e6 bluez-utils-2.22.ebuild 2633
+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 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355
+MD5 8640fa9eafee8ea600121af7792b7ad9 files/2.16/bluetooth.rc 3396
 MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
 MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
-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 7300259b4a7fdd010164c37004269877 files/digest-bluez-utils-2.18 68
-MD5 7b0985abd13b5bbc75fe58e206372a65 files/digest-bluez-utils-2.15 68
-MD5 5b6549a4300097637d65ab565a6c9535 files/digest-bluez-utils-2.19 68
-MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
-MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355
 MD5 7a47fa7ef1dc74a77dfb13ed5f96b983 files/bluez-utils-2.21-init.d 3399
-MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/bluez-utils-2.21-pin 5
-MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17-r1 68
 MD5 992426019dbbd772c9326512d2a0033d files/bluez-utils-2.21-pin-helper.sh 49
-MD5 f98d1052bca4dd960f4d92ad331ba348 files/digest-bluez-utils-2.21 68
 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
+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 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 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 8640fa9eafee8ea600121af7792b7ad9 files/2.16/bluetooth.rc 3396
+MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
+MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
diff --git a/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild
deleted file mode 100644
index af99ed7f0ae5..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild
+++ /dev/null
@@ -1,99 +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.10-r1.ebuild,v 1.5 2005/04/20 21:37:29 hansmi 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.10
-	!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};
-
-	# Fix some installation locations
-	for dir in rfcomm sdpd pand hcid dund 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
-
-	epatch ${FILESDIR}/${P}-handsfree.patch
-
-	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.15.ebuild b/net-wireless/bluez-utils/bluez-utils-2.15.ebuild
deleted file mode 100644
index 3cfac0714c84..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.15.ebuild
+++ /dev/null
@@ -1,100 +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.15.ebuild,v 1.6 2005/07/08 17:29:57 liquidx Exp $
-
-IUSE="gtk alsa cups pcmcia"
-
-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 hppa"
-
-RDEPEND=">=net-wireless/bluez-libs-2.15
-	!net-wireless/bluez-pan
-	dev-libs/libusb
-	pcmcia? ( virtual/pcmcia )
-	gtk? ( >=dev-python/pygtk-2.2 )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )"
-
-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 \
-		$(use_enable cups) \
-		$(use_enable alsa) \
-		$(use_enable pcmcia) \
-		$(use_enable gtk bluepin) \
-		--disable-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.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-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild
deleted file mode 100644
index ad9b0e8f0aef..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.16-r1.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-r1.ebuild,v 1.5 2005/06/17 20:35:38 hansmi 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
deleted file mode 100644
index ca3203ecf59a..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild
+++ /dev/null
@@ -1,106 +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.17-r1.ebuild,v 1.6 2005/07/29 20:29:39 gmsoft 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 hppa"
-
-RDEPEND=">=net-wireless/bluez-libs-2.17
-	!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? ( virtual/pcmcia 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 \
-		--localstatedir=/var \
-		|| die "econf failed"
-	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.18.ebuild b/net-wireless/bluez-utils/bluez-utils-2.18.ebuild
deleted file mode 100644
index cc6a2431001d..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.18.ebuild
+++ /dev/null
@@ -1,112 +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.18.ebuild,v 1.2 2005/07/08 17:29: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.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 )
-	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 ! 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 \
-		--enable-avctrl \
-		--enable-dfutool \
-		--localstatedir=/var \
-		|| die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	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
-
-	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.19.ebuild b/net-wireless/bluez-utils/bluez-utils-2.19.ebuild
index f01ff56f353f..9d8833263590 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.19.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.19.ebuild,v 1.6 2005/08/17 13:11:55 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.19.ebuild,v 1.7 2006/01/02 07:47:06 compnerd Exp $
 
 IUSE="gtk alsa cups pcmcia dbus"
 
@@ -20,7 +20,7 @@ RDEPEND=">=net-wireless/bluez-libs-2.19
 	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 !>=sys-apps/dbus-0.60 )
 	pcmcia? ( virtual/pcmcia sys-apps/setserial )"
 
 DEPEND="sys-devel/bison
diff --git a/net-wireless/bluez-utils/bluez-utils-2.21.ebuild b/net-wireless/bluez-utils/bluez-utils-2.21.ebuild
index c6a2ab439280..23f4c84c2830 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.21.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.21.ebuild,v 1.1 2005/10/23 13:00:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.21.ebuild,v 1.2 2006/01/02 07:47:06 compnerd Exp $
 
 DESCRIPTION="Bluetooth Tools and System Daemons for using Bluetooth under Linux"
 HOMEPAGE="http://bluez.sourceforge.net/"
@@ -17,7 +17,7 @@ RDEPEND="!net-wireless/bluez-pan
 		dev-libs/libusb
 		alsa? ( >=media-libs/alsa-lib-1.0.9 )
 		cups? ( net-print/cups )
-		dbus? ( >=sys-apps/dbus-0.31 )
+		dbus? ( >=sys-apps/dbus-0.31 !>=sys-apps/dbus-0.60 )
 		gtk? ( >=dev-python/pygtk-2.2 )
 		pcmcia? ( virtual/pcmcia
 				  sys-apps/setserial )"
diff --git a/net-wireless/bluez-utils/bluez-utils-2.22.ebuild b/net-wireless/bluez-utils/bluez-utils-2.22.ebuild
index 787d63cef4e7..8b6cc0c998a8 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.22.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.2 2005/12/17 13:08:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.22.ebuild,v 1.3 2006/01/02 07:47:06 compnerd Exp $
 
 DESCRIPTION="Bluetooth Tools and System Daemons for using Bluetooth under Linux"
 HOMEPAGE="http://bluez.sourceforge.net/"
@@ -17,7 +17,7 @@ RDEPEND="!net-wireless/bluez-pan
 		dev-libs/libusb
 		alsa? ( >=media-libs/alsa-lib-1.0.9 )
 		cups? ( net-print/cups )
-		dbus? ( >=sys-apps/dbus-0.31 )
+		dbus? ( >=sys-apps/dbus-0.31 !>=sys-apps/dbus-0.60 )
 		gtk? ( >=dev-python/pygtk-2.2 )
 		pcmcia? ( virtual/pcmcia
 				  sys-apps/setserial )"
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.10-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.10-r1
deleted file mode 100644
index 9d6edfd94983..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f936b90e32eb24904dea70bd0a464f0 bluez-utils-2.10.tar.gz 290371
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.15 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.15
deleted file mode 100644
index 0b2ea8d6fc7c..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e86dfd4449ff49e82696d8a3b254002 bluez-utils-2.15.tar.gz 299709
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.16-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.16-r1
deleted file mode 100644
index 7cbe12d62273..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.16-r1
+++ /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-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.17-r1
deleted file mode 100644
index 91c9a6d166cf..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.17-r1
+++ /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
deleted file mode 100644
index cbe74a44051d..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c6a20f96971833a8fee3877158f175f bluez-utils-2.18.tar.gz 494205