Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 02 Apr 2016 14:59:37
Message-Id: 1459609161.a0d35b639a9ba08653ef3f959a9a32ad093c46a8.kensington@gentoo
1 commit: a0d35b639a9ba08653ef3f959a9a32ad093c46a8
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 17:03:29 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 14:59:21 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d35b63
7
8 kde5.eclass: raise kde-apps/kde4-l10n blocker for Plasma 5.6
9
10 Gentoo-bug: 578568
11
12 eclass/kde5.eclass | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
16 index 842f3d2..313e060 100644
17 --- a/eclass/kde5.eclass
18 +++ b/eclass/kde5.eclass
19 @@ -152,9 +152,15 @@ case ${KDE_AUTODEPS} in
20 COMMONDEPEND+=" $(add_qt_dep qtcore)"
21
22 if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
23 + local blocked_version=15.08.0-r1
24 +
25 + if [[ ${CATEGORY} = kde-plasma && $(get_version_component_range 2) -ge 6 ]]; then
26 + blocked_version=15.12.3-r1
27 + fi
28 +
29 RDEPEND+="
30 !kde-apps/kde4-l10n[-minimal(-)]
31 - !<kde-apps/kde4-l10n-15.08.0-r1
32 + !<kde-apps/kde4-l10n-${blocked_version}
33 "
34 fi