dummy upgrade for people who installed 2.16 but with a botched hid2hci init script patch (#75255)

(Portage version: 2.0.51.19)

5 files changed, 124 insertions, 21 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index b3dd442999b7..743056b6e028 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.38 2005/04/26 15:02:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.39 2005/04/27 12:40:04 liquidx Exp $
+
+*bluez-utils-2.16-r1 (27 Apr 2005)
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org> files/2.16/bluetooth.rc,
+  +bluez-utils-2.16-r1.ebuild:
+  dummy upgrade for people who installed 2.16 but with a botched hid2hci init
+  script patch (#75255)
 
 *bluez-utils-2.16 (26 Apr 2005)
 
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 38f8e70edf5e..135db627ba07 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1d0c0b955ed41753647a43e9c658dfee ChangeLog 6105
 MD5 b049b8c4d26d949b96515f79c805084c bluez-utils-2.10-r1.ebuild 2591
 MD5 5b012319f221d1ea2adea1b2f253e7f6 bluez-utils-2.10.ebuild 2294
@@ -9,6 +6,7 @@ MD5 f64c66af2e6161fbe1e99f097ed4c38f bluez-utils-2.15.ebuild 2482
 MD5 43c46462d55ff522368adcca12159bd9 bluez-utils-2.7.ebuild 2276
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
 MD5 b53ad8b5d89ae0211e3e94525ea8e7f5 bluez-utils-2.16.ebuild 2683
+MD5 b53ad8b5d89ae0211e3e94525ea8e7f5 bluez-utils-2.16-r1.ebuild 2683
 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
@@ -22,14 +20,8 @@ MD5 8f08bc200ec5740dd96c1043257f776f files/digest-bluez-utils-2.7 67
 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 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 dbf76ea62689ccd5f24aedf0c47e61a8 files/2.16/bluetooth.rc 3397
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCblgvTM53OX+9xmMRAl8RAKCddlYnO8QVE59gu4nROCTsUhOslQCgzwQh
-oOwBQDZcOMCR0bDsmouPY44=
-=G7nl
------END PGP SIGNATURE-----
+MD5 2b21065fe818cc70291c603e90fef4bb files/2.16/bluetooth.rc 3396
diff --git a/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild
new file mode 100644
index 000000000000..0b8e8b21d2e7
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.16-r1.ebuild
@@ -0,0 +1,104 @@
+# 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.1 2005/04/27 12:40:04 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/files/2.16/bluetooth.rc b/net-wireless/bluez-utils/files/2.16/bluetooth.rc
index 11600fde9db1..ab2acef23f65 100644
--- a/net-wireless/bluez-utils/files/2.16/bluetooth.rc
+++ b/net-wireless/bluez-utils/files/2.16/bluetooth.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/2.16/bluetooth.rc,v 1.1 2005/04/26 15:02:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/files/2.16/bluetooth.rc,v 1.2 2005/04/27 12:40:04 liquidx Exp $
 
 UART_CONF="/etc/bluetooth/uart"
 
@@ -23,6 +23,13 @@ stop_uarts() {
 start() {
    	ebegin "Starting Bluetooth"
 
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci -0 -q    #be quiet
+		/bin/sleep 1 # delay for hid's to be detected by hotplug
+		eend $?
+	fi
+
 	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
 		if [ -f "${HCID_CONFIG}" ]; then
 			ebegin "    Starting hcid"
@@ -49,14 +56,6 @@ start() {
 		eend $?
 	fi
 
-
-	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
-		ebegin "    Running hid2hci"
-		/usr/sbin/hid2hci -0 -q    #be quiet
-		/bin/sleep 1 # delay for hid's to be detected by hotplug
-		eend $?
-	fi
-
 	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
 		if [ -f "${RFCOMM_CONFIG}" ]; then
 			ebegin "    Starting rfcomm"
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
new file mode 100644
index 000000000000..7cbe12d62273
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.16-r1
@@ -0,0 +1 @@
+MD5 c1d5364723109a978801d155d1f4da1e bluez-utils-2.16.tar.gz 471966