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

[Johannes Huber]

commit:     5d17c91bd7caf88ac1d0f36166c2663c5a8d56f1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 17:38:42 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 17:38:42 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d17c91b

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

Package-Manager: portage-2.2.15

---
 kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild | 3 ++-
 kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild  | 3 ++-
 kde-plasma/plasma-nm/plasma-nm-9999.ebuild    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild
index d821210..2082ba6 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild
@@ -50,8 +50,9 @@ DEPEND="
        )
 "
 RDEPEND="${DEPEND}
+       !kde-base/plasma-nm
        !kde-misc/networkmanagement
-       !kde-misc/plasma-nm:4
+       !kde-misc/plasma-nm
 "
 
 src_configure() {

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild
index f093485..3264060 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.1.95.ebuild
@@ -50,8 +50,9 @@ DEPEND="
        )
 "
 RDEPEND="${DEPEND}
+       !kde-base/plasma-nm
        !kde-misc/networkmanagement
-       !kde-misc/plasma-nm:4
+       !kde-misc/plasma-nm
 "
 
 src_configure() {

diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index 98509c3..8d71563 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -50,8 +50,9 @@ DEPEND="
        )
 "
 RDEPEND="${DEPEND}
+       !kde-base/plasma-nm
        !kde-misc/networkmanagement
-       !kde-misc/plasma-nm:4
+       !kde-misc/plasma-nm
 "
 
 src_configure() {