diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-07-25 00:12:33 +0200 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-07-26 01:51:05 +1000 |
| commit | 523575023973ab92a14fdc9266bbfdc68f7dfb92 (patch) | |
| tree | 3efdb46b7ed209ca8245c5e49c92e2241fda1da0 /eclass/kde4-functions.eclass | |
| parent | 05a9a5c2e2e319f2c3af511bf2e6952edab4eb72 (diff) | |
| download | kde-523575023973ab92a14fdc9266bbfdc68f7dfb92.tar.gz kde-523575023973ab92a14fdc9266bbfdc68f7dfb92.tar.bz2 kde-523575023973ab92a14fdc9266bbfdc68f7dfb92.zip | |
[eclass] Treat stable-live the same as live
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 10 |
1 files changed, 3 insertions, 7 deletions
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} |