[gentoo-commits] proj/kde:master commit in: kde-base/plasma-desktop/

[Johannes Huber]

commit:     2796a51c6c1e1a82764eea7d480cbb6885ea215b
Author:     Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Mon Aug 11 15:53:55 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 18:40:10 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2796a51c

[kde-base/plasma-desktop] Block kde-base/systemsettings:4 and 
kde-base/plasma-workspace:4

Add a blocker due to various file conflicts with kde-base/systemsettings:4 and
kde-base/plasma-workspace:4.

Package-Manager: portage-2.2.8-r1

---
 kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild    | 2 ++
 kde-base/plasma-desktop/plasma-desktop-5.0.9999.ebuild | 2 ++
 kde-base/plasma-desktop/plasma-desktop-9999.ebuild     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
index d411896..445ccc6 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.0.ebuild
@@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/knetattach:4
        !kde-base/kdepasswd:4
        !kde-base/kcontrol:4
+       !kde-base/plasma-workspace:4
+       !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        dev-qt/qtconcurrent:5

diff --git a/kde-base/plasma-desktop/plasma-desktop-5.0.9999.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-5.0.9999.ebuild
index 198e681..0e51eae 100644
--- a/kde-base/plasma-desktop/plasma-desktop-5.0.9999.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-5.0.9999.ebuild
@@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/kcontrol:4
        !kde-base/knetattach:4
        !kde-base/kdepasswd:4
+       !kde-base/plasma-workspace:4
+       !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        dev-qt/qtconcurrent:5

diff --git a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
index bc4ea38..8e71a4c 100644
--- a/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-base/plasma-desktop/plasma-desktop-9999.ebuild
@@ -90,6 +90,8 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/knetattach:4
        !kde-base/kdepasswd:4
        !kde-base/solid-actions-kcm:4
+       !kde-base/plasma-workspace:4
+       !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        dev-qt/qtconcurrent:5