From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9FA391393F1 for ; Mon, 14 Sep 2015 16:03:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1716421C004; Mon, 14 Sep 2015 16:03:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE29121C004 for ; Mon, 14 Sep 2015 16:03:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E7EB3407E2 for ; Mon, 14 Sep 2015 16:03:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 364CD189 for ; Mon, 14 Sep 2015 16:03:31 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1442246602.bc7fb2c4d2ec9c733efda1d275cab90eaf48c0df.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: bc7fb2c4d2ec9c733efda1d275cab90eaf48c0df X-VCS-Branch: master Date: Mon, 14 Sep 2015 16:03:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b833c3e2-4be5-44c7-93ed-926a9bb2435f X-Archives-Hash: e392e5acea03ed6c1fc83efac62d9d95 commit: bc7fb2c4d2ec9c733efda1d275cab90eaf48c0df Author: Michael Palimaka gentoo org> AuthorDate: Mon Sep 14 16:01:26 2015 +0000 Commit: Michael Palimaka gentoo 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 }