[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     91002a490d380f2b09b4b9c6dff8bcaf33d89633
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 16:35:46 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 16:35:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=91002a49

kde-plasma/plasma-workspace: introduce geolocation USE flag.

This allows avoiding a networkmanager dependency.

Gentoo-bug: 546854

Package-Manager: portage-2.2.20.1

 kde-plasma/plasma-workspace/metadata.xml                      |  1 +
 .../plasma-workspace/plasma-workspace-5.4.49.9999.ebuild      | 11 +++++++++--
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild      | 11 +++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 8b5ce50..f81610b 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="drkonqi">Enables DrKonqi, the KDE crash handler</flag>
+		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="prison">Enable support for barcodes/QRcodes</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="systemmonitor">Enables the system monitor dialog for the Plasma workspace</flag>

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
index d561e29..7939abd 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5 multilib pam
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="dbus +drkonqi gps prison qalculate +systemmonitor"
+IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
 
 COMMON_DEPEND="
 	$(add_plasma_dep kwayland)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep networkmanager-qt)
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
 	dev-libs/wayland
@@ -87,6 +86,7 @@ COMMON_DEPEND="
 		$(add_frameworks_dep kdewebkit)
 		dev-qt/qtwebkit:5
 	)
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
 	gps? ( sci-geosciences/gpsd )
 	prison? ( media-libs/prison:5 )
 	qalculate? ( sci-libs/libqalculate )
@@ -142,6 +142,13 @@ src_prepare() {
 		comment_add_subdirectory drkonqi
 	fi
 
+	if ! use geolocation; then
+		punt_bogus_deps KF5 NetworkManagerQt
+		pushd dataengines > /dev/null || die
+			comment_add_subdirectory geolocation
+		popd > /dev/null || die
+	fi
+
 	if ! use systemmonitor; then
 		comment_add_subdirectory systemmonitor
 		pushd applets > /dev/null || die

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index b7932e8..6b1343c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5 multilib pam
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="dbus +drkonqi gps prison qalculate +systemmonitor"
+IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
 
 COMMON_DEPEND="
 	$(add_plasma_dep kwayland)
@@ -56,7 +56,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep networkmanager-qt)
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
 	dev-libs/wayland
@@ -87,6 +86,7 @@ COMMON_DEPEND="
 		$(add_frameworks_dep kdewebkit)
 		dev-qt/qtwebkit:5
 	)
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
 	gps? ( sci-geosciences/gpsd )
 	prison? ( media-libs/prison:5 )
 	qalculate? ( sci-libs/libqalculate )
@@ -139,6 +139,13 @@ src_prepare() {
 		comment_add_subdirectory drkonqi
 	fi
 
+	if ! use geolocation; then
+		punt_bogus_deps KF5 NetworkManagerQt
+		pushd dataengines > /dev/null || die
+			comment_add_subdirectory geolocation
+		popd > /dev/null || die
+	fi
+
 	if ! use systemmonitor; then
 		comment_add_subdirectory systemmonitor
 		pushd applets > /dev/null || die