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

[Johannes Huber]

commit:     bd5f86cfa5d98e4f728eb06247c5e5b176057c50
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 19:34:21 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 19:34:28 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bd5f86cf

[kde-plasma/plasma-desktop] Fix file collisions, bug #534792

Package-Manager: portage-2.2.15

---
 kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild    | 1 +
 kde-plasma/plasma-desktop/plasma-desktop-5.2.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.2.0.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild
index 67b4553..3fa356f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.2.0.ebuild
@@ -91,6 +91,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        $(add_kdeplasma_dep kio-extras)
        sys-apps/accountsservice
+       !kde-apps/kcontrol
        !kde-base/attica
        !kde-base/kcontrol
        !kde-base/kdepasswd

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild
index 3db19d2..89e8a33 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.2.9999.ebuild
@@ -91,6 +91,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        $(add_kdeplasma_dep kio-extras)
        sys-apps/accountsservice
+       !kde-apps/kcontrol
        !kde-base/attica
        !kde-base/kcontrol
        !kde-base/kdepasswd

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index e0b8c3d..6701a83 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -92,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        $(add_kdeplasma_dep kio-extras)
        sys-apps/accountsservice
+       !kde-apps/kcontrol
        !kde-base/attica
        !kde-base/kcontrol
        !kde-base/kdepasswd