[gentoo-commits] proj/kde:master commit in: kde-apps/kdesdk-meta/

[Michael Palimaka]

commit:     b929802a5681e86df4630b7a5195e3feae747091
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon May  4 22:19:42 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May  6 13:35:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b929802a

[kde-apps/kdesdk-meta] Address kde4- vs. kf5-based conflict

Package-Manager: portage-2.2.18

 kde-apps/kdesdk-meta/kdesdk-meta-15.04.0.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-15.04.0.ebuild 
b/kde-apps/kdesdk-meta/kdesdk-meta-15.04.0.ebuild
index 08b839e..528e024 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-15.04.0.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-15.04.0.ebuild
@@ -12,15 +12,19 @@ KEYWORDS=" ~amd64"
 IUSE="cvs"
 
 RDEPEND="
-       $(add_kdeapps_dep dolphin-plugins)
+       || (
+               (       $(add_kdeapps_dep dolphin-plugins)
+                       kde-apps/kompare:4
+                       kde-apps/libkomparediff2:4      )
+               (       $(add_kdeapps_dep kompare)
+                       $(add_kdeapps_dep libkomparediff2)      )
+       )
        $(add_kdeapps_dep kapptemplate)
        $(add_kdeapps_dep kate)
        $(add_kdeapps_dep kcachegrind)
        $(add_kdeapps_dep kde-dev-scripts)
        $(add_kdeapps_dep kde-dev-utils)
        $(add_kdeapps_dep kdesdk-kioslaves)
-       $(add_kdeapps_dep kompare)
-       $(add_kdeapps_dep libkomparediff2)
        $(add_kdeapps_dep lokalize)
        $(add_kdeapps_dep okteta)
        $(add_kdeapps_dep poxml)