bump to 2.7 blocks bluez-pan as incorporated.

4 files changed, 102 insertions, 10 deletions

diff --git a/net-wireless/bluez-libs/Manifest b/net-wireless/bluez-libs/Manifest
index ee5b96a3f3c3..fe34042d75e6 100644
--- a/net-wireless/bluez-libs/Manifest
+++ b/net-wireless/bluez-libs/Manifest
@@ -1,6 +1,8 @@
-MD5 958f6ab210ed2c109e13851dacf89252 ChangeLog 1670
-MD5 dc75cd7f224fbdfe37452d618a145f28 bluez-libs-2.4.ebuild 569
 MD5 d027eabb6bb77f097ca195cc951f212a bluez-libs-2.5.ebuild 746
+MD5 0f743e76cf09635ae0224dfcdef3c8b3 bluez-libs-2.7.ebuild 676
+MD5 dc75cd7f224fbdfe37452d618a145f28 bluez-libs-2.4.ebuild 569
+MD5 958f6ab210ed2c109e13851dacf89252 ChangeLog 1670
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
 MD5 80177a4623589ccbcfd22e5b167f135e files/digest-bluez-libs-2.4 66
 MD5 fa955b5c11e33f8d98a80f6cc24d79db files/digest-bluez-libs-2.5 66
+MD5 e9e80d4297e7ac6f8e8018d52f9a082c files/digest-bluez-libs-2.7 66
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 6111dfe14a8c..e1d66feaacda 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,15 +1,17 @@
-MD5 0b9264ccaaabeffd568e779d853abc0f ChangeLog 3175
-MD5 692a3eaf43a51b9c4ae9573cff03cbf9 bluez-utils-2.3-r1.ebuild 1919
+MD5 20c323cbff29a56d754250d8c7ff9835 bluez-utils-2.7.ebuild 2290
 MD5 0b8a00a2269c0c96a4b67a14d2b5af11 bluez-utils-2.3-r2.ebuild 2461
+MD5 692a3eaf43a51b9c4ae9573cff03cbf9 bluez-utils-2.3-r1.ebuild 1919
 MD5 5453b4e49cb21237ba44de829cb87cd8 bluez-utils-2.3.ebuild 1539
+MD5 0b9264ccaaabeffd568e779d853abc0f ChangeLog 3175
 MD5 a25f458999747318d14260e90ad57479 bluez-utils-2.5.ebuild 2265
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 f433e34b2f05d5daa5bf509a7f36bf57 files/bluetooth.rc 1099
-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 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3 67
 MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3-r1 67
 MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3-r2 67
-MD5 3b8896ca69850cb62ca395aa7357bf5a files/digest-bluez-utils-2.5 67
+MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
+MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
+MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3 67
+MD5 3b8896ca69850cb62ca395aa7357bf5a files/digest-bluez-utils-2.5 67
+MD5 8f08bc200ec5740dd96c1043257f776f files/digest-bluez-utils-2.7 67
+MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295
+MD5 f433e34b2f05d5daa5bf509a7f36bf57 files/bluetooth.rc 1099
diff --git a/net-wireless/bluez-utils/bluez-utils-2.7.ebuild b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
new file mode 100644
index 000000000000..4dda6d26d02c
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
@@ -0,0 +1,87 @@
+# 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.7.ebuild,v 1.1 2004/05/27 14:23:44 puggy 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"
+RDEPEND=">=net-wireless/bluez-libs-2.7
+	!bluez-pan
+	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 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
+
+	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 [ -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.7 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.7
new file mode 100644
index 000000000000..9371bcc6c3e5
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.7
@@ -0,0 +1 @@
+MD5 5b67e008efa785175cdbc3c8dcdebab2 bluez-utils-2.7.tar.gz 283519