[gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/

[Andreas Sturmlechner]

commit:     4886584eeb8362e381ddf78c5ec9e4748ec044d0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 00:35:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 00:35:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4886584e

dev-util/kdevplatform: Add USE=webkit

Upstream commit 2486228ccee2280af10f8e202d8020abe89880fc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/kdevplatform/kdevplatform-9999.ebuild | 6 ++++--
 dev-util/kdevplatform/metadata.xml             | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild 
b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 2c21ed3720..eea19fc60b 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
+IUSE="cvs reviewboard subversion webkit +welcomepage"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
@@ -46,7 +46,6 @@ COMMON_DEPEND="
        $(add_qt_dep qtdbus)
        $(add_qt_dep qtgui)
        $(add_qt_dep qttest)
-       $(add_qt_dep qtwebkit)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtxml)
        dev-libs/grantlee:5
@@ -56,6 +55,8 @@ COMMON_DEPEND="
                dev-libs/apr-util:1
                dev-vcs/subversion
        )
+       webkit? ( $(add_qt_dep qtwebkit) )
+       !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
        welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
 "
 DEPEND="${COMMON_DEPEND}
@@ -88,6 +89,7 @@ src_configure() {
                -DBUILD_cvs=$(usex cvs)
                $(cmake-utils_use_find_package reviewboard 
KDEExperimentalPurpose)
                $(cmake-utils_use_find_package subversion SubversionLibrary)
+               $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
                $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
        )
 

diff --git a/dev-util/kdevplatform/metadata.xml 
b/dev-util/kdevplatform/metadata.xml
index 3017fcac60..3194ed032c 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/metadata.xml
@@ -7,6 +7,7 @@
        </maintainer>
        <use>
                <flag name="reviewboard">Enable reviewboard support</flag>
+               <flag name="webkit">Enable deprecated 
<pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for 
integrated documentation</flag>
                <flag name="welcomepage">Enable welcome page, requires 
<pkg>dev-qt/qtdeclarative</pkg></flag>
        </use>
 </pkgmetadata>