commit: 7d2a22e21a5457c76e254ddaebd7f3e2f0767e47
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 17:31:36 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 17:31:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d2a22e2
kde-plasma/plasma-desktop: introduce blocker on
!<kde-frameworks/kactivities-5.20.0
Detected file collision(s):
/usr/lib/debug/usr/lib64/qt5/qml/org/kde/activities/settings/libkactivitiessettingsplugin.so.debug
/usr/lib/debug/usr/lib64/qt5/plugins/kcm_activities.so.debug
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/GeneralTab.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/OtherTab.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/DialogButtons.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/LabeledTextField.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/ShortcutChooser.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/IconChooser.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/privacyTab/BlacklistApplicationView.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activitiesTab/ActivitiesView.qml
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activitiesTab/main.qml
/usr/share/kservices5/kcm_activities.desktop
/usr/lib64/qt5/plugins/kcm_activities.so
/usr/lib64/qt5/qml/org/kde/activities/settings/libkactivitiessettingsplugin.so
/usr/lib64/qt5/qml/org/kde/activities/settings/qmldir
Package-Manager: portage-2.2.27
kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild | 1 +
kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild | 1 +
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
index c3de995..2d93736 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild
@@ -106,6 +106,7 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/plasma-workspace:4
!kde-base/solid-actions-kcm:4
!kde-base/systemsettings:4
+ !<kde-frameworks/kactivities-5.20.0
!kde-misc/kcm_touchpad
!kde-misc/kcm-touchpad
!kde-plasma/kcm-touchpad
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
index af28a55..5838c1c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild
@@ -106,6 +106,7 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/plasma-workspace:4
!kde-base/solid-actions-kcm:4
!kde-base/systemsettings:4
+ !<kde-frameworks/kactivities-5.20.0
!kde-misc/kcm_touchpad
!kde-misc/kcm-touchpad
!kde-plasma/kcm-touchpad
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index af28a55..5838c1c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -106,6 +106,7 @@ RDEPEND="${COMMON_DEPEND}
!kde-base/plasma-workspace:4
!kde-base/solid-actions-kcm:4
!kde-base/systemsettings:4
+ !<kde-frameworks/kactivities-5.20.0
!kde-misc/kcm_touchpad
!kde-misc/kcm-touchpad
!kde-plasma/kcm-touchpad
