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

[Johannes Huber]

commit:     b67c8ac5ebf4579d43946a27441523d361dea878
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 28 15:35:32 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 15:03:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b67c8ac5

[eclass] Fix minimum dependencies after kde-apps pkgmove

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

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 2a4c206..989eeb9 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -296,10 +296,10 @@ add_kdeapps_dep() {
        # to allow merging packages against more stable basic stuff
        elif [[ ${PV} == *.9999 ]]; then
                ver=$(get_kde_version)
-       # if building live master depend on final stable applications version
-       # as live KDE4 ebuilds are slowly being shown the door
-       elif [[ ${CATEGORY} == kde-apps && ${PV} == 9999 ]]; then
-               ver=14.12.3
+       # 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}
        fi