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 AAEDC138334 for ; Thu, 6 Dec 2018 19:47:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA2B5E0977; Thu, 6 Dec 2018 19:46:59 +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 7E327E0977 for ; Thu, 6 Dec 2018 19:46:59 +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 ACC6F335CEB for ; Thu, 6 Dec 2018 19:46:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE4A44ED for ; Thu, 6 Dec 2018 19:46:55 +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: <1544125576.56f30cd9bb63cad661de50cefdb7afd4a7e8ccb3.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 56f30cd9bb63cad661de50cefdb7afd4a7e8ccb3 X-VCS-Branch: master Date: Thu, 6 Dec 2018 19:46:55 +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: 5a58f3a9-9572-4eae-b331-3ad04bee1101 X-Archives-Hash: 2869b34e9596c3422879cd6a99473787 commit: 56f30cd9bb63cad661de50cefdb7afd4a7e8ccb3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 4 23:52:07 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 6 19:46:16 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=56f30cd9 qt5-build.eclass: Drop obsolete qtwebkit quirks Remaining qtwebkit ebuild uses CMake. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index ee4875de..70f2bed9 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -123,14 +123,13 @@ esac IUSE="debug test" -[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584 [[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182 DEPEND=" dev-lang/perl virtual/pkgconfig " -if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then +if [[ ${PN} != qttest ]]; then DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" fi RDEPEND=" @@ -147,7 +146,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr # Unpacks the sources. qt5-build_src_unpack() { # bug 307861 - if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then + if [[ ${PN} == qtwebengine ]]; then eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then ewarn