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: Thu, 31 Jan 2019 10:21:08
Message-Id: 1548930042.e409e9cea6e064b3373af5756c9dcd0206d9c692.asturm@gentoo
1 commit: e409e9cea6e064b3373af5756c9dcd0206d9c692
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 30 21:32:05 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 31 10:20:42 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e409e9ce
7
8 kde5-functions.eclass: Disallow add_qt_dep for discontinued qtwebkit
9
10 Drop support for it as packages are slowly being ported away from it.
11
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 eclass/kde5-functions.eclass | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
18 index 622c38dd36..8860f3f068 100644
19 --- a/eclass/kde5-functions.eclass
20 +++ b/eclass/kde5-functions.eclass
21 @@ -270,10 +270,10 @@ add_qt_dep() {
22 local slot=${4}
23
24 if [[ -z ${version} ]]; then
25 + version=${QT_MINIMAL}
26 if [[ ${1} = qtwebkit ]]; then
27 - version=5.9.1 # no more upstream release
28 - else
29 - version=${QT_MINIMAL}
30 + version=5.9.1
31 + [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later"
32 fi
33 fi
34 if [[ -z ${slot} ]]; then