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

[Michael Palimaka]

commit:     fc39aa7997276020c37314af7564ab41ecc03f6d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 16:48:39 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 16:48:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc39aa79

[eclass] Handle extra-cmake-modules move.

 eclass/kde5-functions.eclass |  5 -----
 eclass/kde5.eclass           | 10 ++--------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 494205c..648dff0 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -23,11 +23,6 @@ case ${EAPI} in
        *) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-# @ECLASS-VARIABLE: ECM_MINIMAL
-# @DESCRIPTION:
-# Minimal extra-cmake-modules version to require for the package.
-: ${ECM_MINIMAL:=1.8.0}
-
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f0d7c57..01c0771 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -38,7 +38,7 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare 
src_configure src_
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
-# For any other value, add a dependency on dev-libs/extra-cmake-modules and 
dev-qt/qtcore:5.
+# For any other value, add a dependency on dev-qt/qtcore:5 and 
kde-frameworks/extra-cmake-modules:5.
 : ${KDE_AUTODEPS:=true}
 
 # @ECLASS-VARIABLE: KDE_DEBUG
@@ -105,25 +105,19 @@ fi
 case ${KDE_AUTODEPS} in
        false)  ;;
        *)
-               if [[ ${CATEGORY} = kde-frameworks ]]; then
-                       ECM_MINIMAL=1.$(get_version_component_range 2).0
-               fi
-
                if [[ ${KDE_BUILD_TYPE} = live ]]; then
                        case ${CATEGORY} in
                                kde-frameworks)
-                                       ECM_MINIMAL=9999
                                        FRAMEWORKS_MINIMAL=9999
                                ;;
                                kde-plasma)
-                                       ECM_MINIMAL=9999
                                        FRAMEWORKS_MINIMAL=9999
                                ;;
                                *) ;;
                        esac
                fi
 
-               DEPEND+=" >=dev-libs/extra-cmake-modules-${ECM_MINIMAL}"
+               DEPEND+=" $(add_frameworks_dep extra-cmake-modules)"
                RDEPEND+=" >=kde-frameworks/kf-env-3"
                COMMONDEPEND+=" >=dev-qt/qtcore-${QT_MINIMAL}:5"