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

[Michael Palimaka]

commit:     5f6f7aee7134de9feb57b08ff8aed6665b6abb7e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 14:54:52 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue May 12 14:54:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f6f7aee

[eclass] Reorder add_kdebase_deps logic to fix kde-apps stable branch.

 eclass/kde4-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 7bc70ad..b767aad 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