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

[Johannes Huber]

commit:     d536e50ce2d1a3bb98bc9f597324d4f4662ef280
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 19:03:21 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 19:03:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d536e50c

[kde-plasma/plasma-desktop] Fix file collisions with kde-base/plasma-desktop

Package-Manager: portage-2.2.15

---
 kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild  | 16 ++++++++--------
 kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild | 16 ++++++++--------
 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild   | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild
index 3608ec3..ea6aa09 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.1.2.ebuild
@@ -89,14 +89,14 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        sys-apps/accountsservice
-       !kde-base/attica:4
-       !kde-base/kcontrol:4
-       !kde-apps/knetattach:4[handbook]
-       !kde-base/knetattach:4[handbook]
-       !kde-base/kdepasswd:4
-       !kde-base/solid-actions-kcm:4
-       !kde-base/plasma-workspace:4
-       !kde-base/systemsettings:4
+       !kde-base/attica
+       !kde-base/kcontrol
+       !kde-base/kdepasswd
+       !kde-apps/knetattach[handbook]
+       !kde-base/plasma-desktop
+       !kde-base/plasma-workspace
+       !kde-base/solid-actions-kcm
+       !kde-base/systemsettings
 "
 DEPEND="${COMMON_DEPEND}
        x11-proto/xproto

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild
index cee79aa..78555ea 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.1.95.ebuild
@@ -90,14 +90,14 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        sys-apps/accountsservice
-       !kde-base/attica:4
-       !kde-base/kcontrol:4
-       !kde-apps/knetattach:4[handbook]
-       !kde-base/knetattach:4[handbook]
-       !kde-base/kdepasswd:4
-       !kde-base/solid-actions-kcm:4
-       !kde-base/plasma-workspace:4
-       !kde-base/systemsettings:4
+       !kde-base/attica
+       !kde-base/kcontrol
+       !kde-base/kdepasswd
+       !kde-base/knetattach[handbook]
+       !kde-base/plasma-desktop
+       !kde-base/plasma-workspace
+       !kde-base/solid-actions-kcm
+       !kde-base/systemsettings
 "
 DEPEND="${COMMON_DEPEND}
        x11-proto/xproto

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 77e89f1..7beb6c2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -90,14 +90,14 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        sys-apps/accountsservice
-       !kde-base/attica:4
-       !kde-base/kcontrol:4
-       !kde-apps/knetattach:4[handbook]
-       !kde-base/knetattach:4[handbook]
-       !kde-base/kdepasswd:4
-       !kde-base/solid-actions-kcm:4
-       !kde-base/plasma-workspace:4
-       !kde-base/systemsettings:4
+       !kde-base/attica
+       !kde-base/kcontrol
+       !kde-base/kdepasswd
+       !kde-base/knetattach[handbook]
+       !kde-base/plasma-desktop
+       !kde-base/plasma-workspace
+       !kde-base/solid-actions-kcm
+       !kde-base/systemsettings
 "
 DEPEND="${COMMON_DEPEND}
        x11-proto/xproto