From 523575023973ab92a14fdc9266bbfdc68f7dfb92 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 25 Jul 2015 00:12:33 +0200 Subject: [eclass] Treat stable-live the same as live --- eclass/kde4-functions.eclass | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'eclass/kde4-functions.eclass') diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 989eeb99f2f..d480bcb7851 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} -- cgit v1.2.3