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

[Johannes Huber]

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

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

Package-Manager: portage-2.2.15

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

diff --git a/kde-plasma/milou/milou-5.1.2.ebuild 
b/kde-plasma/milou/milou-5.1.2.ebuild
index 3046c41..3c637c0 100644
--- a/kde-plasma/milou/milou-5.1.2.ebuild
+++ b/kde-plasma/milou/milou-5.1.2.ebuild
@@ -21,4 +21,6 @@ DEPEND="
        dev-qt/qtdeclarative:5
        dev-qt/qtgui:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/milou
+"

diff --git a/kde-plasma/milou/milou-5.1.95.ebuild 
b/kde-plasma/milou/milou-5.1.95.ebuild
index 3046c41..3c637c0 100644
--- a/kde-plasma/milou/milou-5.1.95.ebuild
+++ b/kde-plasma/milou/milou-5.1.95.ebuild
@@ -21,4 +21,6 @@ DEPEND="
        dev-qt/qtdeclarative:5
        dev-qt/qtgui:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/milou
+"

diff --git a/kde-plasma/milou/milou-9999.ebuild 
b/kde-plasma/milou/milou-9999.ebuild
index 9038fa7..2cdbaa4 100644
--- a/kde-plasma/milou/milou-9999.ebuild
+++ b/kde-plasma/milou/milou-9999.ebuild
@@ -21,4 +21,6 @@ DEPEND="
        dev-qt/qtdeclarative:5
        dev-qt/qtgui:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !kde-base/milou
+"