From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45565138334 for ; Thu, 31 Jan 2019 10:21:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42354E0A64; Thu, 31 Jan 2019 10:21:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2146DE0A64 for ; Thu, 31 Jan 2019 10:21:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 131D2335C29 for ; Thu, 31 Jan 2019 10:21:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E138A51C for ; Thu, 31 Jan 2019 10:21:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1548930042.e409e9cea6e064b3373af5756c9dcd0206d9c692.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e409e9cea6e064b3373af5756c9dcd0206d9c692 X-VCS-Branch: master Date: Thu, 31 Jan 2019 10:21:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 050a126a-5897-4b11-8575-a8ef872e465a X-Archives-Hash: da8f5634bb312614c8e5fc259b86dbf4 commit: e409e9cea6e064b3373af5756c9dcd0206d9c692 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 30 21:32:05 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 31 10:20:42 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e409e9ce 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 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 622c38dd36..8860f3f068 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -270,10 +270,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