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

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

commit:     a7f1ecabc48b0e804dea71df917cea23c6469c57
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 18:16:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 18:16:30 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7f1ecab

kde-apps/marble: Drop USE webkit, add USE webengine

Upstream commit b42ee5c83d77761ef7d8bf8635662159bc2884bb

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 kde-apps/marble/marble-9999.ebuild | 10 +++++-----
 kde-apps/marble/metadata.xml       |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index 2ec8a2e844..8f136a3b97 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
 KEYWORDS=""
 
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
 RDEPEND="
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	phonon? ( media-libs/phonon[qt5(+)] )
 	shapefile? ( sci-libs/shapelib:= )
-	webkit? ( $(add_qt_dep qtwebkit) )
+	webengine? ( $(add_qt_dep qtwebkit) )
 "
 DEPEND="${RDEPEND}
 	aprs? ( dev-lang/perl )
@@ -76,8 +76,8 @@ src_configure() {
 		-DWITH_KF5=$(usex kde)
 		-DWITH_Phonon4Qt5=$(usex phonon)
 		-DWITH_libshp=$(usex shapefile)
-		$(cmake-utils_use_find_package webkit Qt5WebKit)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package webkit Qt5WebEngine)
+		$(cmake-utils_use_find_package webkit Qt5WebEngineWidgets)
 		-DWITH_libwlocate=OFF
 		# bug 608890
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"

diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index 88bdb56140..565eba0753 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -11,5 +11,6 @@
 		<flag name="geolocation">Enable position information via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
 	</use>
 </pkgmetadata>