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

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

commit:     b1aab568194c845bf87bd6dc8323e67b8867e2e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 09:17:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 09:18:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1aab568

kde-apps/marble: Rename USE=positioning -> geolocation

Gentoo-bug: 631750
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 kde-apps/marble/marble-17.08.49.9999.ebuild | 6 +++---
 kde-apps/marble/marble-9999.ebuild          | 6 +++---
 kde-apps/marble/metadata.xml                | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-apps/marble/marble-17.08.49.9999.ebuild b/kde-apps/marble/marble-17.08.49.9999.ebuild
index 5b31a6ced7..0314306b6b 100644
--- a/kde-apps/marble/marble-17.08.49.9999.ebuild
+++ b/kde-apps/marble/marble-17.08.49.9999.ebuild
@@ -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 +positioning shapefile +webkit"
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
 RDEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
 	aprs? ( $(add_qt_dep qtserialport) )
 	dbus? ( $(add_qt_dep qtdbus) )
 	designer? ( $(add_qt_dep designer) )
+	geolocation? ( $(add_qt_dep qtpositioning) )
 	gps? ( sci-geosciences/gpsd )
 	kde? (
 		$(add_frameworks_dep kconfig)
@@ -44,7 +45,6 @@ RDEPEND="
 		$(add_frameworks_dep kwallet)
 	)
 	phonon? ( media-libs/phonon[qt5(+)] )
-	positioning? ( $(add_qt_dep qtpositioning) )
 	shapefile? ( sci-libs/shapelib:= )
 	webkit? ( $(add_qt_dep qtwebkit) )
 "
@@ -69,7 +69,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package positioning Qt5Positioning)
+		$(cmake-utils_use_find_package geolocation Qt5Positioning)
 		-DBUILD_MARBLE_TESTS=$(usex test)
 		-DWITH_DESIGNER_PLUGIN=$(usex designer)
 		-DWITH_libgps=$(usex gps)

diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index 5b31a6ced7..0314306b6b 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.ebuild
@@ -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 +positioning shapefile +webkit"
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
 RDEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
 	aprs? ( $(add_qt_dep qtserialport) )
 	dbus? ( $(add_qt_dep qtdbus) )
 	designer? ( $(add_qt_dep designer) )
+	geolocation? ( $(add_qt_dep qtpositioning) )
 	gps? ( sci-geosciences/gpsd )
 	kde? (
 		$(add_frameworks_dep kconfig)
@@ -44,7 +45,6 @@ RDEPEND="
 		$(add_frameworks_dep kwallet)
 	)
 	phonon? ( media-libs/phonon[qt5(+)] )
-	positioning? ( $(add_qt_dep qtpositioning) )
 	shapefile? ( sci-libs/shapelib:= )
 	webkit? ( $(add_qt_dep qtwebkit) )
 "
@@ -69,7 +69,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package positioning Qt5Positioning)
+		$(cmake-utils_use_find_package geolocation Qt5Positioning)
 		-DBUILD_MARBLE_TESTS=$(usex test)
 		-DWITH_DESIGNER_PLUGIN=$(usex designer)
 		-DWITH_libgps=$(usex gps)

diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index e6bb9652ae..88bdb56140 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -8,8 +8,8 @@
 	<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="positioning">Enable position information via <pkg>dev-qt/qtpositioning</pkg> and <pkg>dev-qt/qtlocation</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 	</use>
 </pkgmetadata>