Fix default location of init scripts (#88446). Correct einfo (#82043).

Package-Manager: portage-2.0.51.19

3 files changed, 22 insertions, 14 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index 09c9977ae393..8c5d228b58b4 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kdebluetooth
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.29 2005/05/14 14:27:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.30 2005/07/07 15:23:13 greg_g Exp $
+
+  07 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdebluetooth-0.99_beta1-r1.ebuild:
+  Fix default location of init scripts (#88446). Correct einfo (#82043).
 
   14 May 2005; Guy Martin <gmsoft@gentoo.org>
   kdebluetooth-0.99_beta1-r1.ebuild:
diff --git a/net-wireless/kdebluetooth/Manifest b/net-wireless/kdebluetooth/Manifest
index 0aa9c014fc87..6d84a0e2521b 100644
--- a/net-wireless/kdebluetooth/Manifest
+++ b/net-wireless/kdebluetooth/Manifest
@@ -1,15 +1,15 @@
-MD5 1ff27fbdeb10eeab201a7955fcd572a4 ChangeLog 5111
-MD5 571299009701df4ec8f23e2cf4aef962 kdebluetooth-0.0.20041107.ebuild 1221
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 MD5 4a29b7ec4c0905c9589ebf879d185d7d kdebluetooth-0.0.20050122-r2.ebuild 1292
+MD5 1330da8eda863471c768fa6d8c263517 ChangeLog 5272
+MD5 e844bbf67d71087b8de459c8a9eed163 kdebluetooth-0.0.20041107-r1.ebuild 1243
+MD5 b30c15ec6f9c1af8e6b502ab3f39c368 kdebluetooth-0.99_beta1-r1.ebuild 1614
 MD5 db195819f5e1b5ee1aeab7b353e250cc kdebluetooth-0.0.20050122-r3.ebuild 1652
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 672574d897e817edb11f3fee2f261f8f kdebluetooth-0.99_beta1-r1.ebuild 1456
+MD5 571299009701df4ec8f23e2cf4aef962 kdebluetooth-0.0.20041107.ebuild 1221
 MD5 eec7a045399a2906a767f8a9e41d3224 kdebluetooth-0.99_beta1.ebuild 1350
-MD5 e844bbf67d71087b8de459c8a9eed163 kdebluetooth-0.0.20041107-r1.ebuild 1243
-MD5 1c17ed483299dbbc833848b8240f72ed files/digest-kdebluetooth-0.0.20041107 79
 MD5 78c5495a9ebb614300827c58268678f9 files/digest-kdebluetooth-0.0.20050122-r2 78
 MD5 78c5495a9ebb614300827c58268678f9 files/digest-kdebluetooth-0.0.20050122-r3 78
-MD5 5bb361cacedd24a470aba4425814ae6b files/kdebluetooth-0.0.20050122-compile.patch 533
 MD5 8cc409d86fe7e8cdbe634fd6a075797d files/digest-kdebluetooth-0.99_beta1 76
-MD5 8cc409d86fe7e8cdbe634fd6a075797d files/digest-kdebluetooth-0.99_beta1-r1 76
+MD5 1c17ed483299dbbc833848b8240f72ed files/digest-kdebluetooth-0.0.20041107 79
+MD5 5bb361cacedd24a470aba4425814ae6b files/kdebluetooth-0.0.20050122-compile.patch 533
 MD5 1c17ed483299dbbc833848b8240f72ed files/digest-kdebluetooth-0.0.20041107-r1 79
+MD5 8cc409d86fe7e8cdbe634fd6a075797d files/digest-kdebluetooth-0.99_beta1-r1 76
diff --git a/net-wireless/kdebluetooth/kdebluetooth-0.99_beta1-r1.ebuild b/net-wireless/kdebluetooth/kdebluetooth-0.99_beta1-r1.ebuild
index 8a070e997eba..645b634a68fe 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-0.99_beta1-r1.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-0.99_beta1-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/kdebluetooth/kdebluetooth-0.99_beta1-r1.ebuild,v 1.4 2005/05/14 14:27:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-0.99_beta1-r1.ebuild,v 1.5 2005/07/07 15:23:13 greg_g Exp $
 
 inherit kde
 
@@ -28,16 +28,20 @@ RDEPEND="|| ( kde-base/kdialog kde-base/kdebase )"
 need-kde 3
 
 src_compile() {
-	kde_src_compile myconf
-	myconf="$myconf `use_with xmms` `use_enable irmc irmcsynckonnector`"
-	kde_src_compile configure make
+	# Change defaults to match our bluez-utils setup
+	sed -i -e 's,/etc/init\.d/bluez-utils,/etc/init\.d/bluetooth,' \
+		${S}/kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.cpp || die
+
+	local myconf="$(use_with xmms) $(use_enable irmc irmcsynckonnector)"
+
+	kde_src_compile
 }
 
 pkg_postinst() {
 	einfo 'This new version of kde-bluetooth provides a replacement for the'
 	einfo 'standard bluepin program "kbluepin". If you want to use this version,'
 	einfo 'you have to edit "/etc/bluetooth/hcid.conf" and change the line'
-	einfo '"pin_helper oldbluepin;" to "pin_helper /usr/bin/kbluepin;".'
+	einfo '"pin_helper oldbluepin;" to "pin_helper /usr/lib/kdebluetooth/kbluepin;".'
 	einfo 'Then restart hcid to make the change take effect.'
 	einfo ''
 	einfo 'The bemused server (avaible with the "xmms" USE flag enabled) only works with'