| 1 |
commit: 7d2a22e21a5457c76e254ddaebd7f3e2f0767e47 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 4 17:31:36 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 4 17:31:36 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d2a22e2 |
| 7 |
|
| 8 |
kde-plasma/plasma-desktop: introduce blocker on !<kde-frameworks/kactivities-5.20.0 |
| 9 |
|
| 10 |
Detected file collision(s): |
| 11 |
|
| 12 |
/usr/lib/debug/usr/lib64/qt5/qml/org/kde/activities/settings/libkactivitiessettingsplugin.so.debug |
| 13 |
/usr/lib/debug/usr/lib64/qt5/plugins/kcm_activities.so.debug |
| 14 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/GeneralTab.qml |
| 15 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/OtherTab.qml |
| 16 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/DialogButtons.qml |
| 17 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/LabeledTextField.qml |
| 18 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/ShortcutChooser.qml |
| 19 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activityDialog/components/IconChooser.qml |
| 20 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/privacyTab/BlacklistApplicationView.qml |
| 21 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activitiesTab/ActivitiesView.qml |
| 22 |
/usr/share/kf5/kactivitymanagerd/workspace/settings/qml/activitiesTab/main.qml |
| 23 |
/usr/share/kservices5/kcm_activities.desktop |
| 24 |
/usr/lib64/qt5/plugins/kcm_activities.so |
| 25 |
/usr/lib64/qt5/qml/org/kde/activities/settings/libkactivitiessettingsplugin.so |
| 26 |
/usr/lib64/qt5/qml/org/kde/activities/settings/qmldir |
| 27 |
|
| 28 |
Package-Manager: portage-2.2.27 |
| 29 |
|
| 30 |
kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild | 1 + |
| 31 |
kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild | 1 + |
| 32 |
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 1 + |
| 33 |
3 files changed, 3 insertions(+) |
| 34 |
|
| 35 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild |
| 36 |
index c3de995..2d93736 100644 |
| 37 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild |
| 38 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.95.ebuild |
| 39 |
@@ -106,6 +106,7 @@ RDEPEND="${COMMON_DEPEND} |
| 40 |
!kde-base/plasma-workspace:4 |
| 41 |
!kde-base/solid-actions-kcm:4 |
| 42 |
!kde-base/systemsettings:4 |
| 43 |
+ !<kde-frameworks/kactivities-5.20.0 |
| 44 |
!kde-misc/kcm_touchpad |
| 45 |
!kde-misc/kcm-touchpad |
| 46 |
!kde-plasma/kcm-touchpad |
| 47 |
|
| 48 |
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 |
| 49 |
index af28a55..5838c1c 100644 |
| 50 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild |
| 51 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.6.49.9999.ebuild |
| 52 |
@@ -106,6 +106,7 @@ RDEPEND="${COMMON_DEPEND} |
| 53 |
!kde-base/plasma-workspace:4 |
| 54 |
!kde-base/solid-actions-kcm:4 |
| 55 |
!kde-base/systemsettings:4 |
| 56 |
+ !<kde-frameworks/kactivities-5.20.0 |
| 57 |
!kde-misc/kcm_touchpad |
| 58 |
!kde-misc/kcm-touchpad |
| 59 |
!kde-plasma/kcm-touchpad |
| 60 |
|
| 61 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 62 |
index af28a55..5838c1c 100644 |
| 63 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 64 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 65 |
@@ -106,6 +106,7 @@ RDEPEND="${COMMON_DEPEND} |
| 66 |
!kde-base/plasma-workspace:4 |
| 67 |
!kde-base/solid-actions-kcm:4 |
| 68 |
!kde-base/systemsettings:4 |
| 69 |
+ !<kde-frameworks/kactivities-5.20.0 |
| 70 |
!kde-misc/kcm_touchpad |
| 71 |
!kde-misc/kcm-touchpad |
| 72 |
!kde-plasma/kcm-touchpad |
Archives