From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Wed, 13 Jan 2016 22:22:50 +0000 (+0100)
Subject: kde4-functions.eclass: Exclude KDE PIM from 4.14.3 lowered deps logic
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4f12b9edb535a731b5bbaa9dafcd8b8b5e32731c;p=gentoo.git

kde4-functions.eclass: Exclude KDE PIM from 4.14.3 lowered deps logic

Split packages will fail to build against unexpected lower kdepim deps.
---

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 7319bc506d66..174cc93c2222 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -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}