summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-07-07 15:23:13 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-07-07 15:23:13 +0000
commitcf616ad5db26be333a59557c00738e4f4e6d450e (patch)
tree5e248c12685bff2ed0b887f63621be953790cc08 /net-wireless
parentStable on x86 wrt #90779 (diff)
downloadgentoo-2-cf616ad5db26be333a59557c00738e4f4e6d450e.tar.gz
gentoo-2-cf616ad5db26be333a59557c00738e4f4e6d450e.tar.bz2
gentoo-2-cf616ad5db26be333a59557c00738e4f4e6d450e.zip
Fix default location of init scripts (#88446). Correct einfo (#82043).
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/kdebluetooth/ChangeLog6
-rw-r--r--net-wireless/kdebluetooth/kdebluetooth-0.99_beta1-r1.ebuild14
2 files changed, 14 insertions, 6 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/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'