summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-05-23 14:11:04 +0200
committerJohannes Huber <johu@gentoo.org>2014-05-23 14:11:04 +0200
commit7eb2b810dfc7512a3de222a5e8a829ea0c9f3457 (patch)
tree341e7b6297c5ed33c03debb9a08605a9f2ef6543
parentd2296ff9940b6a67986dcba4f343f9802693b500 (diff)
downloadkde-7eb2b810dfc7512a3de222a5e8a829ea0c9f3457.tar.gz
kde-7eb2b810dfc7512a3de222a5e8a829ea0c9f3457.tar.bz2
kde-7eb2b810dfc7512a3de222a5e8a829ea0c9f3457.zip
[kde-base/milou] Block kde-misc/milou
Fixes file collisions. Package-Manager: portage-2.2.10
-rw-r--r--kde-base/milou/milou-4.96.0.ebuild1
-rw-r--r--kde-base/milou/milou-9999.ebuild1
2 files changed, 2 insertions, 0 deletions
diff --git a/kde-base/milou/milou-4.96.0.ebuild b/kde-base/milou/milou-4.96.0.ebuild
index 5cab996d0e3..86b99592b83 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 6e624b6a378..7c55ba336ce 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
"