commit:     c854e790de9715ec89cbd45876fc66aa49b53c90
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Mar 22 21:04:15 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 15:40:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c854e790

kde-plasma/kactivitymanagerd: Fix file collision

Conflict exists with kde-plasma/plasma-desktop-5.6.0

Gentoo-bug: 578010

Package-Manager: portage-2.2.27

 ...ivitymanagerd-5.6.0.ebuild => kactivitymanagerd-5.6.0-r1.ebuild} | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.0.ebuild 
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.0-r1.ebuild
similarity index 87%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.0.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.0-r1.ebuild
index f15a09b..c3cf7a0 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.0.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.0-r1.ebuild
@@ -32,3 +32,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
        >=dev-libs/boost-1.54
 "
+
+src_install() {
+       kde5_src_install
+       # File collisions with kde-plasma/plasma-desktop...
+       rm -r ${ED}usr/share/locale || die
+}

Reply via email to