diff options
author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-01-13 23:22:50 +0100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-01-14 23:07:06 +1100 |
commit | 4f12b9edb535a731b5bbaa9dafcd8b8b5e32731c (patch) | |
tree | 5b9176ebe0fc1b3a328c4219c36491c849a37af6 /eclass/kde4-functions.eclass | |
parent | app-admin/ansible: do not install obsolete env file (diff) | |
download | gentoo-4f12b9edb535a731b5bbaa9dafcd8b8b5e32731c.tar.gz gentoo-4f12b9edb535a731b5bbaa9dafcd8b8b5e32731c.tar.bz2 gentoo-4f12b9edb535a731b5bbaa9dafcd8b8b5e32731c.zip |
kde4-functions.eclass: Exclude KDE PIM from 4.14.3 lowered deps logic
Split packages will fail to build against unexpected lower kdepim deps.
Diffstat (limited to 'eclass/kde4-functions.eclass')
-rw-r--r-- | eclass/kde4-functions.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
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} |