disable hidd/hid2hci by default, fix pin-helper installation. plus stable

4 files changed, 22 insertions, 16 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index b44582db65b9..b2e282ee2d9b 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,9 @@
 # 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.31 2004/10/03 20:18:20 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.32 2004/10/16 17:26:22 liquidx Exp $
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org> bluez-utils-2.10-r1.ebuild:
+  disable hidd/hid2hci by default, fix pin-helper installation.
 
   03 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org>
   bluez-utils-2.10.ebuild, bluez-utils-2.7.ebuild:
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 78349e85380a..7e4cf4b72cda 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,17 +1,17 @@
-MD5 43c46462d55ff522368adcca12159bd9 bluez-utils-2.7.ebuild 2276
-MD5 aa9d56a5d83dd9b43e5056f41dbd08af bluez-utils-2.10-r1.ebuild 2459
-MD5 08506b0727e3d52d91ffbb8f048e2c76 ChangeLog 5013
+MD5 ac7a048c8acd87a2b40ee93411ce1e75 ChangeLog 5153
 MD5 5b012319f221d1ea2adea1b2f253e7f6 bluez-utils-2.10.ebuild 2294
+MD5 43c46462d55ff522368adcca12159bd9 bluez-utils-2.7.ebuild 2276
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
-MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
-MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
+MD5 abec54f84c7ddd245b12c580f14d4d50 bluez-utils-2.10-r1.ebuild 2593
+MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
+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 68
 MD5 8f08bc200ec5740dd96c1043257f776f files/digest-bluez-utils-2.7 67
-MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295
+MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
 MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10-r1 68
-MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10 68
-MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
+MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49
 MD5 49c8d9129d9f561906fafce03ac671ad files/2.10-r1/bluetooth.rc 3340
diff --git a/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild
index 0206c6383a4c..1367629a23a2 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.10-r1.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.10-r1.ebuild,v 1.2 2004/09/24 20:23:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.10-r1.ebuild,v 1.3 2004/10/16 17:26:22 liquidx 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.10
 	!net-wireless/bluez-pan
@@ -70,13 +70,16 @@ src_install() {
 	newexe ${FILESDIR}/2.10-r1/bluetooth.rc bluetooth
 
 	exeinto /etc/bluetooth
-	newexe ${FILESDIR}/2.10-r1/pin-helper pin-helper
+	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() {
diff --git a/net-wireless/libbtctl/Manifest b/net-wireless/libbtctl/Manifest
index 9414e052fef0..2b0a1f8afee8 100644
--- a/net-wireless/libbtctl/Manifest
+++ b/net-wireless/libbtctl/Manifest
@@ -1,7 +1,7 @@
-MD5 c13f6adfd910b6dec1fa9ecc2a41b71e libbtctl-0.4.1.ebuild 1030
-MD5 4a1b737ad03166e27f7c57c994f1e162 libbtctl-0.3.ebuild 941
 MD5 b714049789d53564d4ed1b107839409c ChangeLog 1876
+MD5 4a1b737ad03166e27f7c57c994f1e162 libbtctl-0.3.ebuild 941
+MD5 60ceb0356e194159af9700c4ab306e59 libbtctl-0.4.1.ebuild 1029
 MD5 7a66fef4deb08f29b7cf0de1c2e3a4de metadata.xml 254
 MD5 6fd25ef01add3d4f6b205a586233e783 files/digest-libbtctl-0.3 64
-MD5 2f18fdc85cff32fc3b1eb5dcf7376b3a files/libbtctl-0.4.1-enable_python.patch 1292
 MD5 89c026311c1c9a92f14e59fe40698804 files/digest-libbtctl-0.4.1 66
+MD5 2f18fdc85cff32fc3b1eb5dcf7376b3a files/libbtctl-0.4.1-enable_python.patch 1292