[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     bd2409902087b1b4be9692bf576b3ad78dbc432c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 21:32:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 12:59:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd240990

kde5-functions.eclass: Disallow add_qt_dep for discontinued qtwebkit

Drop support for it as packages are slowly being ported away from it.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/kde5-functions.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8098020c5f2..1d0a0ffb323 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -264,10 +264,10 @@ add_qt_dep() {
        local slot=${4}
 
        if [[ -z ${version} ]]; then
+               version=${QT_MINIMAL}
                if [[ ${1} = qtwebkit ]]; then
-                       version=5.9.1 # no more upstream release
-               else
-                       version=${QT_MINIMAL}
+                       version=5.9.1
+                       [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed 
for 'qtwebkit' in EAPI 7 and later"
                fi
        fi
        if [[ -z ${slot} ]]; then