xfce4-power-manager: Sync with gentoo-x86

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

2 files changed, 37 insertions, 19 deletions

diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 9f8a5bf..6490489 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 1603 SHA256 e69ea3d54723da5c7aeb3993e9ef2dce108f5d7a894bc0bd72a5044f868c4097 SHA512 0ca91bb44c3035188d85f369a55d0c45e9445b852cde131dd67fa664d397de0934635b7cbfdb17d3c6876c322c9ed7fe2328beccac9dc547e097cf2640df5188 WHIRLPOOL 6d2c49ae8d6b20bdb8a154f43dd12fc1e8c6332e489a726674cdfcb2c6b951922c25a27275e776ce93c062ebc5c478294f69756e692869f069f83c21f4c83c99
+EBUILD xfce4-power-manager-9999.ebuild 2353 SHA256 ca0851bd64dd425ab16f275da522dab0cc6bba3733984f5c110c789e5fb007fd SHA512 a95932a404bdd32214776d988bd7f43a3c5663449046a1b07147705b12a926f0dce35dca24617c12e358ce7e6417be5f42f45833bd42ffc02feccc00579df62e WHIRLPOOL c7ac45740c647a94f9315fc1de64c3ea7688443a36879b2a84ebffc5ea42bc96914be39c78daa573251219d62a5657e3713b778df8ffa917193ba3cd231af705
 MISC metadata.xml 261 SHA256 29b07a977816ace8a1fca4a9a2b5ef22ea916a33168a38eb3742a2d3ade8d1fd SHA512 5a25ecbeedb025295cfb507acd73eca8f6d1382b0a16edfef81c8e1b55e2a57bedcaf6aa1c22f20dbffd18d127ec04106b361c4408b7fac32d91e4455282e27f WHIRLPOOL 8124f081e1ec4fcc9c60af388ae8b9a08d1843c05f82ef6464af34fab24f99b07e031af3f881531190e35e716c40c89d8507883854bd081c931ea4d0291131bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlMxw1wACgkQmWq1bYTyC0Pz8QEAuBYVc28CvTIfv482vdzhHaVp
-aSKz6WV5/CjBD4wVk6MBAIJqgLnVUo6GZ+mZNLYeQ3x+404ZZErOnGYWZcwDarlp
-=u+lY
+iF4EAREIAAYFAlOrLZ4ACgkQmWq1bYTyC0MjVgD/R79aJT6RC/Vgfj63ilnJGhFL
+Gb1VAfR+rwXJ6Or9hMkA/3fmErWxto8KFEou7x1W03CpM5uZ8cUBJ7tQc9TZeAJi
+=6anf
 -----END PGP SIGNATURE-----
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 cdbc3ed..f4bb88d 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
@@ -1,9 +1,9 @@
 # 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.2.0-r2.ebuild,v 1.4 2014/01/28 14:17:59 ago Exp $
+# $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 $
 
 EAPI=5
-inherit flag-o-matic linux-info xfconf
+inherit linux-info multilib xfconf
 
 DESCRIPTION="Power manager for the Xfce desktop environment"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
@@ -11,12 +11,13 @@ HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightness"
+IUSE="debug kernel_linux networkmanager policykit +udisks systemd +xfce_plugins_battery +xfce_plugins_brightness"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	>=sys-power/upower-0.9.16
-	>=x11-libs/gtk+-2.20:2
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2
+	>=dev-libs/glib-2.30
+	>=sys-apps/dbus-1.6.18
+	|| ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 )
+	>=x11-libs/gtk+-2.24:2
 	>=x11-libs/libnotify-0.7
 	x11-libs/libX11
 	>=x11-libs/libXrandr-1.2
@@ -24,11 +25,14 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/xfconf-4.10
 	>=xfce-base/libxfce4ui-4.10
 	>=xfce-base/libxfce4util-4.10
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
+	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 )"
+	udisks? ( sys-fs/udisks:0 )
+	!systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	sys-devel/gettext
@@ -45,15 +49,29 @@ pkg_setup() {
 		$(use_enable policykit polkit)
 		--enable-dpms
 		$(use_enable networkmanager network-manager)
-		$(use_enable xfce_plugins_brightness panel-plugins)
 		$(xfconf_use_debug)
 		)
 
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+	# 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 )
+	fi
+
+	DOCS=( AUTHORS NEWS README TODO )
 }
 
 src_install() {
-	xfconf_src_install \
-		docdir=/usr/share/doc/${PF}/html \
-		imagesdir=/usr/share/doc/${PF}/html/images
+	xfconf_src_install
+
+	if ! use xfce_plugins_battery; then
+		rm -f \
+			"${ED}"/usr/$(get_libdir)/xfce4/panel/plugins/libxfce4battery.* \
+			"${ED}"/usr/share/xfce4/panel-plugins/xfce4-battery-plugin.desktop
+	fi
+
+	if ! use xfce_plugins_brightness; then
+		rm -f \
+			"${ED}"/usr/$(get_libdir)/xfce4/panel/plugins/libxfce4brightness.* \
+			"${ED}"/usr/share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
+	fi
 }