diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-06-28 17:35:32 +0200 |
|---|---|---|
| committer |   Johannes Huber <johu@gentoo.org> | 2015-06-29 17:03:13 +0200 |
| commit | b67c8ac5ebf4579d43946a27441523d361dea878 (patch) | |
| tree | 4f9b3aa746616a5db9153bc0dd71f1d0f7fe9396 | |
| parent | [eclass] Sync with tree (diff) | |
| download | kde-b67c8ac5ebf4579d43946a27441523d361dea878.tar.gz kde-b67c8ac5ebf4579d43946a27441523d361dea878.tar.bz2 kde-b67c8ac5ebf4579d43946a27441523d361dea878.zip | |
[eclass] Fix minimum dependencies after kde-apps pkgmove
| -rw-r--r-- | eclass/kde4-functions.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 2a4c20614f..989eeb99f2 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 |