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 B5BA313877A for ; Wed, 3 Sep 2014 20:08:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E67F2E0875; Wed, 3 Sep 2014 20:08:21 +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 45EB2E0875 for ; Wed, 3 Sep 2014 20:08:21 +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 46EC53401A0 for ; Wed, 3 Sep 2014 20:08:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8984F4A13 for ; Wed, 3 Sep 2014 20:08:17 +0000 (UTC) From: "Christoph Mende" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Mende" Message-ID: <1409774867.8dba4c7fea93f59b5848c3555886833cddf5ac33.angelos@gentoo> Subject: [gentoo-commits] proj/xfce:master commit in: xfce-extra/xfce4-power-manager/ X-VCS-Repository: proj/xfce X-VCS-Files: xfce-extra/xfce4-power-manager/metadata.xml xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild X-VCS-Directories: xfce-extra/xfce4-power-manager/ X-VCS-Committer: angelos X-VCS-Committer-Name: Christoph Mende X-VCS-Revision: 8dba4c7fea93f59b5848c3555886833cddf5ac33 X-VCS-Branch: master Date: Wed, 3 Sep 2014 20:08:17 +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: 920516e0-db82-4279-b720-02b35ea57f7b X-Archives-Hash: 996ac0e3580fcdf34bbc9f6c0998c320 commit: 8dba4c7fea93f59b5848c3555886833cddf5ac33 Author: Christoph Mende gentoo org> AuthorDate: Wed Sep 3 20:07:47 2014 +0000 Commit: Christoph Mende gentoo org> CommitDate: Wed Sep 3 20:07:47 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=8dba4c7f xfce4-power-manager: Sync with gentoo-x86 Package-Manager: portage-2.2.10 Manifest-Sign-Key: 84F20B43 --- xfce-extra/xfce4-power-manager/metadata.xml | 3 ++- xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml index 39b2bdd..c294065 100644 --- a/xfce-extra/xfce4-power-manager/metadata.xml +++ b/xfce-extra/xfce4-power-manager/metadata.xml @@ -3,6 +3,7 @@ xfce - Pull in sys-fs/udisks for spindown support + Build the applet for lxde-base/lxpanel, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies. + Pull in sys-fs/udisks:0 for spindown support (DEPRECATED) diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild index f4bb88d..6e749b2 100644 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.0.ebuild,v 1.6 2014/06/23 04:19:25 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.3.1.ebuild,v 1.1 2014/08/20 07:06:28 ssuominen Exp $ EAPI=5 inherit linux-info multilib xfconf @@ -11,7 +11,7 @@ HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_battery +xfce_plugins_brightness" +IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_battery +xfce_plugins_brightness" COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2 >=dev-libs/glib-2.30 @@ -25,13 +25,13 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2 >=xfce-base/xfconf-4.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 + lxpanel? ( lxde-base/lxpanel ) policykit? ( >=sys-auth/polkit-0.112 ) xfce_plugins_battery? ( >=xfce-base/xfce4-panel-4.10 ) xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )" # USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies RDEPEND="${COMMON_DEPEND} networkmanager? ( net-misc/networkmanager ) - udisks? ( sys-fs/udisks:0 ) !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )" DEPEND="${COMMON_DEPEND} dev-util/intltool @@ -47,14 +47,14 @@ pkg_setup() { XFCONF=( $(use_enable policykit polkit) - --enable-dpms $(use_enable networkmanager network-manager) + $(use_enable lxpanel lxdepanel) $(xfconf_use_debug) ) # TODO: Split --disable-panel-plugins to two separate AC_ARG_ENABLEs if ! use xfce_plugins_battery && ! use xfce_plugins_brightness; then - XFCONF+=( --disable-panel-plugins ) + XFCONF+=( --disable-xfce4panel ) fi DOCS=( AUTHORS NEWS README TODO )