kde4-functions.eclass: improve dependency version handling when mixing KDE SC and...
authorMichael Palimaka <kensington@gentoo.org>
Thu, 20 Aug 2015 18:29:51 +0000 (04:29 +1000)
committerMichael Palimaka <kensington@gentoo.org>
Thu, 20 Aug 2015 18:29:51 +0000 (04:29 +1000)
eclass/kde4-functions.eclass

index f7a3bda221e42df4637cccd3032e69f328e7f1b7..133fd264b84157c94e2ff53f1eaf7a4f94e7f979 100644 (file)
@@ -292,10 +292,10 @@ 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 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}
        fi
@@ -325,16 +325,15 @@ add_kdebase_dep() {
                ver=${3}
        elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
                ver=${KDE_OVERRIDE_MINIMAL}
-       elif [[ -n ${KDE_MINIMAL} ]]; then
+       elif [[ ${KDEBASE} != kde-base ]]; then
                ver=${KDE_MINIMAL}
-       # if building live version depend on the final release since there will
-       # not be any more major development. this solves dep errors as not all
-       # packages have kde-base live versions now
-
-       # depend on the last sane released version where the normal >=${PV} dep
-       # is not possible
-       elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]]; then
+       # 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