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 81FC41382C5 for ; Sat, 12 May 2018 14:02:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79662E0AD8; Sat, 12 May 2018 14:02:16 +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 58515E0AD8 for ; Sat, 12 May 2018 14:02:16 +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 3D477335C95 for ; Sat, 12 May 2018 14:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A5C228C for ; Sat, 12 May 2018 14:02:14 +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: <1526133676.db341336f8d6663cf5f4f5e9456c2f2688471142.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: db341336f8d6663cf5f4f5e9456c2f2688471142 X-VCS-Branch: master Date: Sat, 12 May 2018 14:02:14 +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-Archives-Salt: 4d3fa7af-69bc-42ad-a2a1-cfb219bbb08f X-Archives-Hash: a8629de33e90e62b983e7c7ce60f95bb commit: db341336f8d6663cf5f4f5e9456c2f2688471142 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 20:44:16 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 12 14:01:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db341336 kde5-functions.eclass: Fix add_qt_dep for QT_MINIMAL >=5.10 eclass/kde5-functions.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index aab79b0ba9c..4435b09f69d 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -280,7 +280,7 @@ add_qt_dep() { local slot=${4} if [[ -z ${version} ]]; then - if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then + if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then version=5.9.1 # no more upstream release, need bug #624404 else version=${QT_MINIMAL}