gentoo resync : 24.12.2018

4 files changed, 13 insertions, 11 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 813552791041..ab5866b37dfd 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
-DIST marble-18.04.3.tar.xz 52432816 BLAKE2B 103aadfd9e9e940b6c090f124f29464925c2e5f6adefbeac476ea5f8fc5c5eacf9af4171959f6a17d6d7fd5d287b2db8b246a08d0af045c5529f8eb92b566744 SHA512 26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704
 DIST marble-18.08.3.tar.xz 52419996 BLAKE2B 3b591f4feb4614dccc477bc22b67b4e00ba4a499f63d4cf74d38f98f23094018578793fe93f6e393003ad3bd9ac8ba934b665522e8fe75bf9e48ee92c8bcc238 SHA512 c719f78bbae194760ee41ef8926e88edf727089857949ba40dfb51f1e87f640c3553e1a32e5c04757b705641c354009ce0e0fed3ed31d01eea2005686df0d5b9
-EBUILD marble-18.04.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644
-EBUILD marble-18.08.3.ebuild 2245 BLAKE2B 48d674dc5e2ddf57ffa1baa0ca42c6899c9c4caa84daac747db2f4a13fadeda529915dfbe620db3be4172a15fcef29a7898f5c3673b21ca14524e88ddc040736 SHA512 247722856d1efe0f63b0d82040f270dd40b686d58c3556c2c0048812ee252915af7701afb80c45f27b09569156f01340ac3001e9eb8e60500a3b95a1f2b7dabb
-MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
+DIST marble-18.12.0.tar.xz 52415644 BLAKE2B 64a1f229caab03bc1aefdb7dd63a9fb5114c6656a849dea472a586f45f4cebe9ad44c9095aa1c9b1c0b1930af5bdc35f2a77ba4d712fa8959afadb841db1333d SHA512 4cb13b6d4a51d0af6428ce60b728e20e6b6c9f861d27de81aaf258815e7f8114a5571d19a80fb6ebc703cd1e6ac03a2b7e79218f832bd8188a3734b1cadd6360
+EBUILD marble-18.08.3.ebuild 2243 BLAKE2B 4ef171f5aa0fb4b1d28ab9fe80d2ad1763680501255569898e235ed777216e5f8e5240d7d09d24953622644e00edd85069bebb8a5a5844b514e9dc6b0c6c6760 SHA512 8944e1a251ed5f80c14c45a4bd11fa3c8d5c4b9003798222231ae9cd63509b9d7b8bd9f7d1063673fcda1c5a686be4c090f3507d8dac88ad4eb6fd098c6c8a16
+EBUILD marble-18.12.0.ebuild 2276 BLAKE2B 8a175e46d53d7c9c682c65cbb05569ca50cd25ae4452e054689415abd00aa0d0f2b7c9864e7b94075dc007a20522ecd963c563b4fd04ff23af5d6d04c98cdd4e SHA512 b88ddcc0d17867436cc45014b60357c432cfe32b42afc3cd0767411fed79a6b917fb482e4f1e4c88b9e9a97e0a229c9e8c6b3be3c78f6ca71760b2387eb69163
+MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-18.08.3.ebuild b/kde-apps/marble/marble-18.08.3.ebuild
index de3a74c8f668..68e525d428ca 100644
--- a/kde-apps/marble/marble-18.08.3.ebuild
+++ b/kde-apps/marble/marble-18.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
 
diff --git a/kde-apps/marble/marble-18.04.3.ebuild b/kde-apps/marble/marble-18.12.0.ebuild
index a962ad299e6c..f096e9a87d5a 100644
--- a/kde-apps/marble/marble-18.04.3.ebuild
+++ b/kde-apps/marble/marble-18.12.0.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
@@ -11,9 +11,9 @@ inherit kde5
 
 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-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 qtwebengine 'widgets') )
 "
 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 webengine Qt5WebEngine)
+		$(cmake-utils_use_find_package webengine 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 052f511a6982..565eba075334 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -8,7 +8,9 @@
 	<use>
 		<flag name="aprs">Enable support for APRS data sources</flag>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<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>