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

[Johannes Huber]

commit:     bcf3a57c93a537af5ead3fb255b2079c5392d803
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 31 22:24:03 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 31 22:24:03 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bcf3a57c

[eclass] Require live frameworks for build type live, bug #538260

---
 eclass/kde5-functions.eclass | 5 -----
 eclass/kde5.eclass           | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index b50d9a4..21e92fd 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -124,11 +124,6 @@ add_frameworks_dep() {
                version=${3}
        elif [[ ${CATEGORY} = kde-frameworks ]]; then
                version=$(get_version_component_range 1-2)
-       elif [[ ${CATEGORY} = kde-base ]]; then
-               case $(get_kde_version) in
-                       5.1) version=5.3.0 ;;
-                       *) version=${FRAMEWORKS_MINIMAL} ;;
-               esac
        elif [[ -z "${version}" ]] ; then
                version=${FRAMEWORKS_MINIMAL}
        fi

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e971580..489080a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -109,6 +109,7 @@ case ${KDE_AUTODEPS} in
        *)
                if [[ ${KDE_BUILD_TYPE} = live ]]; then
                        ecm_version=9999
+                       FRAMEWORKS_MINIMAL=9999
                elif [[ ${CATEGORY} = kde-frameworks ]]; then
                        ecm_version=1.$(get_version_component_range 2).0
                else