From 4f12b9edb535a731b5bbaa9dafcd8b8b5e32731c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 13 Jan 2016 23:22:50 +0100 Subject: [PATCH] kde4-functions.eclass: Exclude KDE PIM from 4.14.3 lowered deps logic Split packages will fail to build against unexpected lower kdepim deps. --- eclass/kde4-functions.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 7319bc506d666..174cc93c2222b 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}