[gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     0a0962fb6f9399f7dbba8e2231e1ff7b83f12c15
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 10:43:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May  3 10:43:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a0962fb

kde-apps/konqueror: Add USE=webengine

Package-Manager: Portage-2.3.33, Repoman-2.3.9

 kde-apps/konqueror/konqueror-18.04.49.9999.ebuild | 14 ++++++++++----
 kde-apps/konqueror/konqueror-9999.ebuild          | 14 ++++++++++----
 kde-apps/konqueror/metadata.xml                   |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild b/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild
index 49e5bd7b70..ad0cc0383f 100644
--- a/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="activities speech tidy X"
+IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
@@ -46,28 +46,34 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
 	tidy? ( app-text/htmltidy )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${COMMON_DEPEND}
 	activities? ( $(add_frameworks_dep kactivities) )
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
 	!kde-apps/kfmclient:4
 	!kde-apps/konq-plugins
 	!kde-apps/libkonq:5
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
+	if ! use webengine; then
+		punt_bogus_dep Qt5 WebEngineWidgets
+		cmake_comment_add_subdirectory webenginepartexit
+	fi
+
 	kde5_src_prepare
 }
 

diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index 49e5bd7b70..ad0cc0383f 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="activities speech tidy X"
+IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
@@ -46,28 +46,34 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
 	tidy? ( app-text/htmltidy )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${COMMON_DEPEND}
 	activities? ( $(add_frameworks_dep kactivities) )
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
 	!kde-apps/kfmclient:4
 	!kde-apps/konq-plugins
 	!kde-apps/libkonq:5
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
+	if ! use webengine; then
+		punt_bogus_dep Qt5 WebEngineWidgets
+		cmake_comment_add_subdirectory webenginepartexit
+	fi
+
 	kde5_src_prepare
 }
 

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index a198affb54..462e8ca374 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="speech">Build text-to-speech plugin</flag>
+		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag>
 	</use>
 </pkgmetadata>