diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-02-22 16:05:55 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-02-22 16:06:49 +1100 |
| commit | 2be2743f9051f67ca5d5f49780c08cd9ed2b4721 (patch) | |
| tree | b434b3ba082e9e3d2773fd242d676c7a6a5903ae /eclass/kde4-functions.eclass | |
| parent | 0e7481470a9ab2af47172bd8b9d63efafb26791f (diff) | |
| download | kde-2be2743f9051f67ca5d5f49780c08cd9ed2b4721.tar.gz kde-2be2743f9051f67ca5d5f49780c08cd9ed2b4721.tar.bz2 kde-2be2743f9051f67ca5d5f49780c08cd9ed2b4721.zip | |
[eclass] Fix live (9999) dependency logic.
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ba681f749ce..51e70d6491e 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -327,12 +327,12 @@ add_kdebase_dep() { ver=${KDE_OVERRIDE_MINIMAL} elif [[ ${KDEBASE} != kde-base ]]; then ver=${KDE_MINIMAL} + # if building a live version branch (eg. 4.11.49.9999) use the major version elif [[ ${PV} == *.9999 ]]; then ver=$(get_kde_version) - # if building live version depend on the final release since there will - # not be any more major development. this solves dep errors as not all - # packages have kde-base live versions now - elif [[ ${CATEGORY} == kde-apps ]]; then + # if building live master or kde-apps, use the final SC version + # since there are no further general releases. + elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then ver=4.14.3 else ver=${PV} |
