version bump (#93231)

Package-Manager: portage-2.0.51.22-r1

7 files changed, 56 insertions, 121 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 0c15bfbe63ad..e5047e1d807e 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.42 2005/05/14 11:58:53 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.43 2005/05/25 00:30:22 liquidx Exp $
+
+*bluez-utils-2.17 (25 May 2005)
+
+  25 May 2005; Alastair Tse <liquidx@gentoo.org> -bluez-utils-2.7.ebuild,
+  -bluez-utils-2.10.ebuild, bluez-utils-2.16-r1.ebuild,
+  +bluez-utils-2.17.ebuild:
+  version bump (#93231)
 
   14 May 2005; Guy Martin <gmsoft@gentoo.org> bluez-utils-2.15.ebuild:
   Stable on hppa.
diff --git a/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild
index 1587dfbf00fc..974bae568f71 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.16-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.16-r1.ebuild,v 1.2 2005/05/09 11:30:57 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild,v 1.3 2005/05/25 00:30:22 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.16
 	!net-wireless/bluez-pan
diff --git a/net-wireless/bluez-utils/bluez-utils-2.10.ebuild b/net-wireless/bluez-utils/bluez-utils-2.17.ebuild
index 3deb89aba4ca..50fc0c0a6bc9 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.10.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.17.ebuild
@@ -1,21 +1,27 @@
 # 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.ebuild,v 1.5 2005/05/14 11:58:53 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.17.ebuild,v 1.1 2005/05/25 00:30:22 liquidx Exp $
+
+IUSE="gtk alsa cups pcmcia dbus"
 
 inherit eutils
 
-DESCRIPTION="bluetooth utilities"
+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="x86 ~sparc ppc amd64"
-IUSE="gtk"
-RDEPEND=">=net-wireless/bluez-libs-2.10
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=net-wireless/bluez-libs-2.17
 	!net-wireless/bluez-pan
-	gtk? ( >=dev-python/pygtk-2 )
-	dev-libs/libusb"
+	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
@@ -24,31 +30,30 @@ DEPEND="sys-devel/bison
 
 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
-
+	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 || die "econf failed"
-	emake || die
+
+	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() {
@@ -62,24 +67,35 @@ src_install() {
 		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;:" \
+		sed -e "s:\(pin_helper \).*:\1/etc/bluetooth/pin-helper;:" \
 			-i ${D}/etc/bluetooth/hcid.conf
 	fi
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/bluetooth.rc bluetooth
+	newexe ${FILESDIR}/2.16/bluetooth.rc bluetooth
 
 	exeinto /etc/bluetooth
-	newexe ${FILESDIR}/pin.sample pin
-	fperms 0700 /etc/bluetooth/pin
+	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."
+	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."
diff --git a/net-wireless/bluez-utils/bluez-utils-2.7.ebuild b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
deleted file mode 100644
index 36338ae53226..000000000000
--- a/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
+++ /dev/null
@@ -1,87 +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.7.ebuild,v 1.8 2005/05/14 11:58:53 gmsoft 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.7
-	!net-wireless/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 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/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."
-	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/files/digest-bluez-utils-2.10 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.10
deleted file mode 100644
index 9d6edfd94983..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.10
+++ /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.17 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.17
new file mode 100644
index 000000000000..91c9a6d166cf
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.17
@@ -0,0 +1 @@
+MD5 42be19b0029a83824358baa0106da947 bluez-utils-2.17.tar.gz 488141
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.7 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.7
deleted file mode 100644
index 9371bcc6c3e5..000000000000
--- a/net-wireless/bluez-utils/files/digest-bluez-utils-2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b67e008efa785175cdbc3c8dcdebab2 bluez-utils-2.7.tar.gz 283519