Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Tue, 03 Feb 2015 11:39:54
Message-Id: 1422963574.1e05fd1f2e56d247399e797f754255b20246d2aa.kensington@gentoo
1 commit: 1e05fd1f2e56d247399e797f754255b20246d2aa
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 2 18:49:38 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 3 11:39:34 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1e05fd1f
7
8 [eclass] Fix breakage by KDE_APPS_MINIMAL
9
10 commit 6c68003fda689d2240ea45df4614166655f6b8ae made live packages depend on
11 e.g. >=14.12 instead of 5.9999. This change helps out as long as there exist
12 packages with separate frameworks branch. Alternative would be to add 5.9999
13 version to add_kdeapps_dep calls in every affected ebuild.
14
15 Package-Manager: portage-2.2.15
16
17 ---
18 eclass/kde5-functions.eclass | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
22 index 2f30ab4..24ee1b8 100644
23 --- a/eclass/kde5-functions.eclass
24 +++ b/eclass/kde5-functions.eclass
25 @@ -187,7 +187,8 @@ add_kdeapps_dep() {
26 elif [[ ${CATEGORY} = kde-apps ]]; then
27 version=${PV}
28 elif [[ -z "${version}" ]] ; then
29 - version=${KDE_APPS_MINIMAL}
30 + # In KDE applications world, 5.9999 > yy.mm.x
31 + [[ ${PV} = 5.9999 ]] && version=5.9999 || version=${KDE_APPS_MINIMAL}
32 fi
33
34 _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"