commit: 02424df329a2b0b378e32f88700eaa95b0f0d34c
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 19:29:02 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 19:29:12 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=02424df3
kde-plasma/kactivitymanagerd: Re-work file collision
Blocker on old kde-plasma/plasma-desktop installs seems sufficient.
Package-Manager: portage-2.2.28
...vitymanagerd-5.6.1.ebuild => kactivitymanagerd-5.6.1-r1.ebuild} | 7 +------
kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild | 1 +
kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild | 1 +
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
similarity index 87%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
index 5be6b8c..cd12f12 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
@@ -28,13 +28,8 @@ RDEPEND="
$(add_qt_dep qtwidgets)
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
!kde-base/kactivitymanagerd
+ !<kde-plasma/plasma-desktop-5.6.1
"
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
-}
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild
index 216e658..58e647c 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
$(add_qt_dep qtwidgets)
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
!kde-base/kactivitymanagerd
+ !<kde-plasma/plasma-desktop-5.6.1
"
DEPEND="${RDEPEND}
>=dev-libs/boost-1.54
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
index 216e658..58e647c 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
$(add_qt_dep qtwidgets)
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
!kde-base/kactivitymanagerd
+ !<kde-plasma/plasma-desktop-5.6.1
"
DEPEND="${RDEPEND}
>=dev-libs/boost-1.54
