summaryrefslogtreecommitdiff
path: root/eclass/kde4-functions.eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-02-03 16:04:23 +0100
committerMichael Palimaka <kensington@gentoo.org>2016-02-15 03:09:56 +1100
commit7ffc412e866dee9dec52adb91660878b9ef83fd3 (patch)
treeea58e9fe2163cd6aedfba5a17915f5ff71510974 /eclass/kde4-functions.eclass
parent12e2d26591873fad08b40ec6a4f274771bc9cc76 (diff)
downloadkde-7ffc412e866dee9dec52adb91660878b9ef83fd3.tar.gz
kde-7ffc412e866dee9dec52adb91660878b9ef83fd3.tar.bz2
kde-7ffc412e866dee9dec52adb91660878b9ef83fd3.zip
kde4-functions.eclass: Sync with tree
Diffstat (limited to 'eclass/kde4-functions.eclass')
-rw-r--r--eclass/kde4-functions.eclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 917f04b3e2a..174cc93c222 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}