commit: 892fc8c33a595bbebf02963c897a2858d7ee7f14
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 21:04:10 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
</maintainer>
<use>
<flag name="declarative">Build the qdeclarativeview
plugin</flag>
- <flag name="webkit">Build the qwebview plugin</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
