[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/

[Johannes Huber]

commit:     95120fe736931c0439802faf98842630140c1c8f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 25 22:25:04 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Feb 25 22:25:04 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=95120fe7

[kde-plasma/plasma-desktop] Prevent file collisions

Touchpad kcm merged into plasma-desktop. Upstream commit
64dbf36e2b0a9d82b0f4b56c5b7c1a289b823488

Package-Manager: portage-2.2.17

---
 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 593dbed..4b35b03 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -102,6 +102,9 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/plasma-workspace
        !kde-base/solid-actions-kcm
        !kde-base/systemsettings
+       !kde-misc/kcm_touchpad
+       !kde-misc/kcm-touchpad
+       !kde-plasma/kcm-touchpad
 "
 DEPEND="${COMMON_DEPEND}
        x11-proto/xproto