[gentoo-commits] proj/xfce:master commit in: xfce-extra/xfce4-power-manager/

["Christoph Mende" <angelos@gentoo.org>]

commit:     8dba4c7fea93f59b5848c3555886833cddf5ac33
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  3 20:07:47 2014 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> 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 @@
 <pkgmetadata>
   <herd>xfce</herd>
   <use>
-    <flag name='udisks'>Pull in <pkg>sys-fs/udisks</pkg> for spindown support</flag>
+    <flag name='lxpanel'>Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
+    <flag name='udisks'>Pull in <pkg>sys-fs/udisks:0</pkg> for spindown support (DEPRECATED)</flag>
   </use>
 </pkgmetadata>

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 )