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

[Michael Palimaka]

commit:     bc7fb2c4d2ec9c733efda1d275cab90eaf48c0df
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 16:01:26 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 16:03:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc7fb2c4

kde-plasma/plasma-workspace: improve USE="systemmonitor" handling.

This disables the systemmonitor dataengine and plasmoid when the USE flag is
disabled, and adds a new dependnecy when enabled.

The plasmoid uses the systemmonitor dataengine, which uses ksysguardd.

Gentoo-bug: 560428

Package-Manager: portage-2.2.20.1

 kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild | 7 +++++++
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild        | 7 +++++++
 2 files changed, 14 insertions(+)

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 9af5106..d561e29 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
@@ -107,6 +107,7 @@ RDEPEND="${COMMON_DEPEND}
        x11-apps/xrdb
        x11-apps/xset
        x11-apps/xsetroot
+       systemmonitor? ( $(add_plasma_dep ksysguard) )
        !kde-base/freespacenotifier
        !kde-base/libtaskmanager
        !kde-base/kcminit
@@ -143,6 +144,12 @@ src_prepare() {
 
        if ! use systemmonitor; then
                comment_add_subdirectory systemmonitor
+               pushd applets > /dev/null || die
+                       comment_add_subdirectory systemmonitor
+               popd > /dev/null || die
+               pushd dataengines > /dev/null || die
+                       comment_add_subdirectory systemmonitor
+               popd > /dev/null || die
        fi
 }
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 7145c33..b7932e8 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -107,6 +107,7 @@ RDEPEND="${COMMON_DEPEND}
        x11-apps/xrdb
        x11-apps/xset
        x11-apps/xsetroot
+       systemmonitor? ( $(add_plasma_dep ksysguard) )
        !kde-base/freespacenotifier
        !kde-base/libtaskmanager
        !kde-base/kcminit
@@ -140,6 +141,12 @@ src_prepare() {
 
        if ! use systemmonitor; then
                comment_add_subdirectory systemmonitor
+               pushd applets > /dev/null || die
+                       comment_add_subdirectory systemmonitor
+               popd > /dev/null || die
+               pushd dataengines > /dev/null || die
+                       comment_add_subdirectory systemmonitor
+               popd > /dev/null || die
        fi
 }