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

[Michael Palimaka]

commit:     7ffc412e866dee9dec52adb91660878b9ef83fd3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb  3 15:04:23 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:09:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ffc412e

kde4-functions.eclass: Sync with tree

 eclass/kde4-functions.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 917f04b..174cc93 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -294,7 +294,8 @@ add_kdeapps_dep() {
                ver=${KDE_MINIMAL}
        # 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
+       # except when it is kdepim split packages, which rely on same-version 
deps
+       elif [[ ${CATEGORY} == kde-apps || ${PV} == *9999 ]] && [[ ${KMNAME} != 
"kdepim" ]]; then
                ver=4.14.3
        else
                ver=${PV}