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 0E3D3138359 for ; Sun, 22 Nov 2020 22:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 186ADE077A; Sun, 22 Nov 2020 22:57:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 02513E077A for ; Sun, 22 Nov 2020 22:56:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0DDAE33BDF0 for ; Sun, 22 Nov 2020 22:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E432451 for ; Sun, 22 Nov 2020 22:56:57 +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: <1606079050.892fc8c33a595bbebf02963c897a2858d7ee7f14.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/designer/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/designer/designer-5.15.9999.ebuild dev-qt/designer/metadata.xml X-VCS-Directories: dev-qt/designer/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 892fc8c33a595bbebf02963c897a2858d7ee7f14 X-VCS-Branch: master Date: Sun, 22 Nov 2020 22:56:57 +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: b8d39dee-90fe-42c9-832a-a2923e6dde71 X-Archives-Hash: db20a4f56b702eada399383736659337 commit: 892fc8c33a595bbebf02963c897a2858d7ee7f14 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 22 21:04:10 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 22 21:04:10 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=892fc8c3 dev-qt/designer: Drop IUSE=webkit Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/designer/designer-5.15.9999.ebuild | 8 ++++---- dev-qt/designer/metadata.xml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-qt/designer/designer-5.15.9999.ebuild b/dev-qt/designer/designer-5.15.9999.ebuild index bd0d9546..7430389f 100644 --- a/dev-qt/designer/designer-5.15.9999.ebuild +++ b/dev-qt/designer/designer-5.15.9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qttools" inherit desktop qt5-build xdg-utils @@ -11,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="declarative webkit" +IUSE="declarative" DEPEND=" ~dev-qt/qtcore-${PV}:5= @@ -21,7 +22,6 @@ DEPEND=" ~dev-qt/qtwidgets-${PV} ~dev-qt/qtxml-${PV} declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) " RDEPEND="${DEPEND}" @@ -29,8 +29,8 @@ src_prepare() { qt_use_disable_mod declarative quickwidgets \ src/designer/src/plugins/plugins.pro - qt_use_disable_mod webkit webkitwidgets \ - src/designer/src/plugins/plugins.pro + sed -e "s/qtHaveModule(webkitwidgets)/false/g" \ + -i src/designer/src/plugins/plugins.pro || die qt5-build_src_prepare } diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml index 7f1774a4..d07a54a9 100644 --- a/dev-qt/designer/metadata.xml +++ b/dev-qt/designer/metadata.xml @@ -7,7 +7,6 @@ Build the qdeclarativeview plugin - Build the qwebview plugin https://bugreports.qt.io/