Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sat, 08 Apr 2017 08:31:30
Message-Id: 1491601200.c9c4d5e713a374a346b0621ddf1afd1c1b6e6424.asturm@gentoo
1 commit: c9c4d5e713a374a346b0621ddf1afd1c1b6e6424
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 6 23:52:57 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 7 21:40:00 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c9c4d5e7
7
8 kde5.eclass: Add blocker against kde-apps/kde{,pim}-l10n
9
10 Changes in translation handling:
11 https://mail.kde.org/pipermail/kde-distro-packagers/2017-April/000276.html
12
13 eclass/kde5.eclass | 18 +++++++++++-------
14 1 file changed, 11 insertions(+), 7 deletions(-)
15
16 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
17 index f1519b798d..245a1427f3 100644
18 --- a/eclass/kde5.eclass
19 +++ b/eclass/kde5.eclass
20 @@ -172,13 +172,17 @@ case ${KDE_AUTODEPS} in
21 RDEPEND+=" >=kde-frameworks/kf-env-4"
22 COMMONDEPEND+=" $(add_qt_dep qtcore)"
23
24 - if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
25 - RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
26 - fi
27 -
28 - if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
29 - RDEPEND+=" !kde-apps/${PN}:4"
30 - fi
31 + case ${CATEGORY} in
32 + kde-frameworks | \
33 + kde-plasma)
34 + RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
35 + ;;
36 + kde-apps)
37 + [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
38 + [[ $(get_version_component_range 1) -ge 17 ]] && \
39 + RDEPEND+=" !kde-apps/kde-l10n !kde-apps/kdepim-l10n:5"
40 + ;;
41 + esac
42 ;;
43 esac