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

[Michael Palimaka]

commit:     8ab0fb95b737a338bdbfba1a97f99e3a20bef934
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 12:04:50 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 12:04:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ab0fb95

[eclass] Workaround dependency conflicts until ECM is pkgmoved in the main tree 
too.

 eclass/kde5.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 01c0771..46947cf 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -117,7 +117,11 @@ case ${KDE_AUTODEPS} in
                        esac
                fi
 
-               DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
+               if [[ ${CATEGORY} = kde-frameworks && ${PV} > 5.9.0 ]] ; then
+                       DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
+               else
+                       DEPEND+=" >=dev-libs/extra-cmake-modules-1.8.0"
+               fi
                RDEPEND+=" >=kde-frameworks/kf-env-3"
                COMMONDEPEND+=" >=dev-qt/qtcore-${QT_MINIMAL}:5"