summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelirc/ChangeLog5
-rw-r--r--kde-base/kdelirc/kdelirc-4.3.1.ebuild9
2 files changed, 12 insertions, 2 deletions
diff --git a/kde-base/kdelirc/ChangeLog b/kde-base/kdelirc/ChangeLog
index 150f6be7f184..c5724c620e2f 100644
--- a/kde-base/kdelirc/ChangeLog
+++ b/kde-base/kdelirc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdelirc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.77 2009/09/01 15:11:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.78 2009/09/01 21:46:18 wired Exp $
+
+ 01 Sep 2009; Alex Alexander <wired@gentoo.org> kdelirc-4.3.1.ebuild:
+ fixed collision with kscd
*kdelirc-4.3.1 (01 Sep 2009)
diff --git a/kde-base/kdelirc/kdelirc-4.3.1.ebuild b/kde-base/kdelirc/kdelirc-4.3.1.ebuild
index 81194b2b46b1..a8a82d7ec496 100644
--- a/kde-base/kdelirc/kdelirc-4.3.1.ebuild
+++ b/kde-base/kdelirc/kdelirc-4.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.3.1.ebuild,v 1.1 2009/09/01 15:11:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-4.3.1.ebuild,v 1.2 2009/09/01 21:46:18 wired Exp $
EAPI="2"
@@ -15,3 +15,10 @@ RDEPEND="
!kde-misc/kdelirc
app-misc/lirc
"
+
+src_prepare() {
+ kde4-meta_src_prepare
+
+ sed -i "/kscd.profile/d" "${S}"/kdelirc/profiles/CMakeLists.txt ||
+ die "collision fixing sed failed"
+}