diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-05-13 00:54:52 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-05-13 00:54:52 +1000 |
| commit | 5f6f7aee7134de9feb57b08ff8aed6665b6abb7e (patch) | |
| tree | 6a4ed2a32ae00dcbbd5bf1d656be569c8286e584 /eclass/kde4-functions.eclass | |
| parent | e665354b82080fba2523622f97f7533330f26e33 (diff) | |
| download | kde-5f6f7aee7134de9feb57b08ff8aed6665b6abb7e.tar.gz kde-5f6f7aee7134de9feb57b08ff8aed6665b6abb7e.tar.bz2 kde-5f6f7aee7134de9feb57b08ff8aed6665b6abb7e.zip | |
[eclass] Reorder add_kdebase_deps logic to fix kde-apps stable branch.
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 7bc70ad1b96..b767aad4736 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -327,13 +327,13 @@ 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 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 + # if building a live version branch (eg. 4.11.49.9999) use the major version + elif [[ ${PV} == *.9999 ]]; then + ver=$(get_kde_version) else ver=${PV} fi |