summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild (renamed from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild)7
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.49.9999.ebuild1
-rw-r--r--kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild1
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
index 5be6b8cb904..cd12f123509 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 216e658b872..58e647ccbca 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 216e658b872..58e647ccbca 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