| 1 |
commit: bd2409902087b1b4be9692bf576b3ad78dbc432c |
| 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 Feb 7 12:59:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd240990 |
| 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 8098020c5f2..1d0a0ffb323 100644 |
| 19 |
--- a/eclass/kde5-functions.eclass |
| 20 |
+++ b/eclass/kde5-functions.eclass |
| 21 |
@@ -264,10 +264,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 |
Archives