From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 3 Apr 2016 09:03:29 +0000 (+0200)
Subject: kde-plasma/kactivitymanagerd: Add blocker to avoid file collisions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4a737c9e67cec80b5ef12bd92b065c1da7d6df92;p=gentoo.git

kde-plasma/kactivitymanagerd: Add blocker to avoid file collisions

Package-Manager: portage-2.2.28
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
index cd12f123509a..b372c7f1d037 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
 	!kde-base/kactivitymanagerd
 	!<kde-plasma/plasma-desktop-5.6.1
+	!<kde-frameworks/kactivities-5.20.0
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.54