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: Sun, 31 Dec 2017 18:01:29
Message-Id: 1514742183.cfbd0e399fcd6ccd5c0af3f96b484ca1a5001bda.asturm@gentoo
1 commit: cfbd0e399fcd6ccd5c0af3f96b484ca1a5001bda
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 31 17:43:03 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 31 17:43:03 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cfbd0e39
7
8 kde5-functions.eclass: add_qt_dep qtwebkit exception
9
10 Upstream stopped at 5.9.1 and releases are going to be
11 independent from there on.
12
13 eclass/kde5-functions.eclass | 6 +++++-
14 1 file changed, 5 insertions(+), 1 deletion(-)
15
16 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
17 index d531908079..fd118d5cce 100644
18 --- a/eclass/kde5-functions.eclass
19 +++ b/eclass/kde5-functions.eclass
20 @@ -280,7 +280,11 @@ add_qt_dep() {
21 local slot=${4}
22
23 if [[ -z ${version} ]]; then
24 - version=${QT_MINIMAL}
25 + if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then
26 + version=5.9.1 # no more upstream release, need bug #624404
27 + else
28 + version=${QT_MINIMAL}
29 + fi
30 fi
31 if [[ -z ${slot} ]]; then
32 slot="5"