xfce4-power-manager: Sync with gentoo-x86

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 84F20B43

3 files changed, 12 insertions, 11 deletions

diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 6490489..0b4b541 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD xfce4-power-manager-9999.ebuild 2353 SHA256 ca0851bd64dd425ab16f275da522dab0cc6bba3733984f5c110c789e5fb007fd SHA512 a95932a404bdd32214776d988bd7f43a3c5663449046a1b07147705b12a926f0dce35dca24617c12e358ce7e6417be5f42f45833bd42ffc02feccc00579df62e WHIRLPOOL c7ac45740c647a94f9315fc1de64c3ea7688443a36879b2a84ebffc5ea42bc96914be39c78daa573251219d62a5657e3713b778df8ffa917193ba3cd231af705
-MISC metadata.xml 261 SHA256 29b07a977816ace8a1fca4a9a2b5ef22ea916a33168a38eb3742a2d3ade8d1fd SHA512 5a25ecbeedb025295cfb507acd73eca8f6d1382b0a16edfef81c8e1b55e2a57bedcaf6aa1c22f20dbffd18d127ec04106b361c4408b7fac32d91e4455282e27f WHIRLPOOL 8124f081e1ec4fcc9c60af388ae8b9a08d1843c05f82ef6464af34fab24f99b07e031af3f881531190e35e716c40c89d8507883854bd081c931ea4d0291131bb
+EBUILD xfce4-power-manager-9999.ebuild 2371 SHA256 6e1a76e6edcd4a97ce139a21a74ae2151f7a326e125aa8511a819b22c83429f9 SHA512 003549fec72b18da11cfeadbff89a68ae996cd1f37d77013341bf3ef2a9bf8c2c7125a1732b5e6327dd0d03c2137c2d2b55ccae32d693936700eef46daa5270f WHIRLPOOL d39235fa03997e1d58d9e3779cfcf4c5011cd8be08529776ac07826b619de50fd17fc12841b2e2123f8d331da0482e88acceed66044a622a1240adbc7250d82a
+MISC metadata.xml 428 SHA256 62769fb5be40bcf110fde5a8a9953c8daf5e3437f704a7ff2562c1a80ce4e1f2 SHA512 ab61f18c675992c2c433eed83e10e1059236ff98870fe56d8c73f0777ce20a6d4f9bfaefc6bd9c5d8485a41da2e9a630d9ed3445f24c7e942e36813deca449db WHIRLPOOL c804ae4b88811f57e2e738692d07cb69a2f993619358f0badf7c65309001a47de175dbfd40642dfe15ec90580036d49947faaf8fc7862b1333e6a3355a0d32bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlOrLZ4ACgkQmWq1bYTyC0MjVgD/R79aJT6RC/Vgfj63ilnJGhFL
-Gb1VAfR+rwXJ6Or9hMkA/3fmErWxto8KFEou7x1W03CpM5uZ8cUBJ7tQc9TZeAJi
-=6anf
+iF4EAREIAAYFAlQHdRMACgkQmWq1bYTyC0P8vQEAxMezA8riF1gcj3285v8wjff2
+oxnbJnmDTACOn8DCRTgA/ioWQpX2HJQVQZHVLp+eoSduSeFihF16EkGSMig4JFfn
+=46FN
 -----END PGP SIGNATURE-----
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 )