*** empty log message ***

7 files changed, 9 insertions, 321 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index b1820c379c6d..c92743909421 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.25 2004/08/21 01:41:19 puggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.26 2004/08/21 04:45:07 puggy Exp $
+
+  21 Aug 2004; Douglas Russell,,, <puggy@gentoo.org> -bluez-utils-2.5.ebuild,
+  bluez-utils-2.7.ebuild:
+  Bump 2.7 to stable as it's been trouble free for a while. Remove old and fast
+  becoming useless versions. TODO: Bump 2.10 to stable as soon as 2.6.8 kernel
+  reaches stable
 
 *bluez-utils-2.10 (21 Aug 2004)
 
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
deleted file mode 100644
index 1ecc4af1f523..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 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.3-r1.ebuild,v 1.12 2004/06/25 00:44:07 agriffis Exp $
-
-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="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
-	epatch ${FILESDIR}/${P}-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 || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README
-
-	sed -e "s:\(pin_helper \).*:\1/etc/bluetooth/pin;:" \
-		-e "s:security auto;:security user;:" \
-		-i ${D}/etc/bluetooth/hcid.conf
-
-	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 PIN, edit /etc/bluetooth/pin"
-	einfo ""
-}
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
deleted file mode 100644
index 05485eb3dadf..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2004 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.3-r2.ebuild,v 1.9 2004/06/25 00:44:07 agriffis Exp $
-
-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="~x86 ~sparc ~ppc"
-IUSE="gtk gtk2"
-RDEPEND=">=net-wireless/bluez-libs-2.4
-	gtk? ( !gtk2? ( =dev-python/pygtk-0.6* ) )
-	gtk? (  gtk2? ( >=dev-python/pygtk-2 ) )"
-
-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
-	use gtk2 \
-		&& epatch ${FILESDIR}/${P}-bluepin-gtk2.patch \
-		|| epatch ${FILESDIR}/${P}-bluepin.patch
-	epatch ${FILESDIR}/${P}-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 || 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;:" \
-			-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 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.3.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3.ebuild
deleted file mode 100644
index 11565b207fcd..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 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.3.ebuild,v 1.7 2004/06/25 00:44:07 agriffis 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"
-DEPEND="sys-devel/bison
-		sys-devel/flex
-		>=net-wireless/bluez-libs-2.4"
-RDEPEND=">=net-wireless/bluez-libs-2.4
-		 gtk? ( >=dev-python/pygtk-0.6.11 )"
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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() {
-	./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.5.ebuild b/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
deleted file mode 100644
index bccd6478adec..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 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.5.ebuild,v 1.6 2004/06/25 00:44:07 agriffis Exp $
-
-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="~x86 ~sparc ~ppc ~amd64"
-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 || 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;:" \
-			-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 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.7.ebuild b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
index 67cf970d6e8d..7bd861014c48 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.7.ebuild,v 1.5 2004/06/27 02:57:07 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.7.ebuild,v 1.6 2004/08/21 04:45:07 puggy Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~sparc ppc ~amd64"
 IUSE="gtk"
 RDEPEND=">=net-wireless/bluez-libs-2.7
 	!net-wireless/bluez-pan
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.5 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.5
deleted file mode 100644
index 30ca9d9dfd2d..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 425b877a4daf2ff3d8b2693116287db7 bluez-utils-2.5.tar.gz 216466