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

[Johannes Huber]

commit:     7eb2b810dfc7512a3de222a5e8a829ea0c9f3457
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 12:11:04 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 23 12:11:04 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7eb2b810

[kde-base/milou] Block kde-misc/milou

Fixes file collisions.

Package-Manager: portage-2.2.10

---
 kde-base/milou/milou-4.96.0.ebuild | 1 +
 kde-base/milou/milou-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-base/milou/milou-4.96.0.ebuild 
b/kde-base/milou/milou-4.96.0.ebuild
index 5cab996..86b9959 100644
--- a/kde-base/milou/milou-4.96.0.ebuild
+++ b/kde-base/milou/milou-4.96.0.ebuild
@@ -21,4 +21,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_kdebase_dep baloo)
+       !kde-misc/milou
 "

diff --git a/kde-base/milou/milou-9999.ebuild b/kde-base/milou/milou-9999.ebuild
index 6e624b6..7c55ba3 100644
--- a/kde-base/milou/milou-9999.ebuild
+++ b/kde-base/milou/milou-9999.ebuild
@@ -21,4 +21,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_kdebase_dep baloo)
+       !kde-misc/milou
 "