diff options
| author | Johannes Huber <johu@gentoo.org> | 2015-01-31 23:24:03 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-01-31 23:24:03 +0100 |
| commit | bcf3a57c93a537af5ead3fb255b2079c5392d803 (patch) | |
| tree | 8723b01b648a3bedb11803d88828d2c009a8318e | |
| parent | f76d950f19cbb62714347adcacbf5fa1b00a51f5 (diff) | |
| download | kde-bcf3a57c93a537af5ead3fb255b2079c5392d803.tar.gz kde-bcf3a57c93a537af5ead3fb255b2079c5392d803.tar.bz2 kde-bcf3a57c93a537af5ead3fb255b2079c5392d803.zip | |
[eclass] Require live frameworks for build type live, bug #538260
| -rw-r--r-- | eclass/kde5-functions.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde5.eclass | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index b50d9a4eb5e..21e92fdef83 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 e9715803bc0..489080a21a5 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 |