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

[Michael Palimaka]

commit:     523575023973ab92a14fdc9266bbfdc68f7dfb92
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 24 22:12:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 15:51:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=52357502

[eclass] Treat stable-live the same as live

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

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 989eeb9..d480bcb 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -292,13 +292,9 @@ add_kdeapps_dep() {
                ver=${KDE_OVERRIDE_MINIMAL}
        elif [[ ${KDEBASE} != kde-base ]]; then
                ver=${KDE_MINIMAL}
-       # if building stable-live version depend just on the raw KDE version
-       # to allow merging packages against more stable basic stuff
-       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
+       # if building kde-apps, live master or stable-live branch,
+       # 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}