[gentoo-commits] proj/kde:master commit in: kde-apps/kdeedu-data/

[Johannes Huber]

commit:     eaca2e98dca6d73a63baf7e152ea9173686b620e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:45:53 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 07:45:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eaca2e98

kde-apps/kdeedu-data: Fix file collision

Gentoo-bug: 578344

Package-Manager: portage-2.2.28

 kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild | 4 +++-
 kde-apps/kdeedu-data/kdeedu-data-9999.ebuild          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild 
b/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild
index 3df4a9a..5b66dfb 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-16.04.49.9999.ebuild
@@ -15,4 +15,6 @@ DEPEND="
        $(add_frameworks_dep extra-cmake-modules)
        $(add_qt_dep qtcore)
 "
-RDEPEND=""
+RDEPEND="
+       !kde-apps/libkdeedu:4
+"

diff --git a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild 
b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
index 3df4a9a..5b66dfb 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
@@ -15,4 +15,6 @@ DEPEND="
        $(add_frameworks_dep extra-cmake-modules)
        $(add_qt_dep qtcore)
 "
-RDEPEND=""
+RDEPEND="
+       !kde-apps/libkdeedu:4
+"