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

[Johannes Huber]

commit:     9b57ee3fe1d4bfe5c9a626305e22c63b12dedd32
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 17:31:10 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 17 17:31:10 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9b57ee3f

[kde-plasma/kde-cli-tools] Fix file collisions with kde-base/kde-cli-tools

Package-Manager: portage-2.2.15

---
 kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild  | 4 +++-
 kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild | 4 +++-
 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild 
b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild
index 0405eff..3f60a7f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.2.ebuild
@@ -36,7 +36,9 @@ DEPEND="
                x11-libs/libX11
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kde-cli-tools
+"
 
 # requires running kde environment
 RESTRICT="test"

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild 
b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild
index 0405eff..3f60a7f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.1.95.ebuild
@@ -36,7 +36,9 @@ DEPEND="
                x11-libs/libX11
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kde-cli-tools
+"
 
 # requires running kde environment
 RESTRICT="test"

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild 
b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index 67fe968..7fb5d77 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -36,7 +36,9 @@ DEPEND="
                x11-libs/libX11
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/kde-cli-tools
+"
 
 # requires running kde environment
 RESTRICT="test"