xfce4-power-manager: Updated

3 files changed, 50 insertions, 20 deletions

diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index c8650b9..fc7c95f 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-power-manager-9999.ebuild 581 RMD160 77516b52924b5bb67c7835d925b4a1cf04acb0d1 SHA1 6f85dad8cbd3c8a57e6c23537f181be636a2f47f SHA256 d82e847ae67e6255f198b7026cac5cd4a6fe2de654987d2184f1100e4d390135
-MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
+EBUILD xfce4-power-manager-9999.ebuild 1332 RMD160 8db8f52cdf1a69bd265c8d8c2d5259ace1dd04ca SHA1 223f5f97dd16871e6c8ba55bddd2d5cc581814ca SHA256 e4bceca5c16b4b3f99f9b10a5d19957812cb0b32934c9846d8b1c437001bacad
+MISC metadata.xml 228 RMD160 03b1d3fb0f080d0357fc5c9489fd014ded5a0cee SHA1 84d45786e3004ac9d6c7718764e6aa838854e42d SHA256 aab849d07f4e267c08f7352f77a3eed71024e109e09fe1b8300da6a5539995a6
diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index 826e2ca..3215499 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfce</herd>
+  <herd>xfce</herd>
+  <use>
+    <flag name="plugins">Build panel plugins</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 1ab511a..aa8a438 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
@@ -1,28 +1,55 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=2
 inherit xfce4
 
 xfce4_apps
 
-DESCRIPTION="Xfce4 power manager"
+DESCRIPTION="Power manager for Xfce4"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
+
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libnotify"
-
-RDEPEND=">=dev-libs/dbus-glib-0.70
-	>=dev-libs/glib-2.14:2
-	>=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5.6
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
+IUSE="debug doc networkmanager +plugins +policykit"
+
+COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/dbus-glib-0.70
+	>=xfce-base/xfconf-4.6
+	>=xfce-base/libxfce4ui-4.7
+	>=xfce-base/libxfce4util-4.6
+	>=x11-libs/libnotify-0.4.1
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libX11
+	x11-libs/libXext
+	sys-fs/udisks
+	sys-power/upower
+	plugins? ( >=xfce-base/xfce4-panel-4.6 )
+	policykit? ( >=sys-auth/polkit-0.91 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	x11-proto/xproto
+	doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable libnotify)"
+	XFCE_CONFIG+=" $(use_enable policykit polkit)
+		--disable-hal
+		--enable-dpms
+		$(use_enable networkmanager network-manager)
+		$(use_enable plugins panel-plugins)
+		$(use_enable doc xsltproc)"
+
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+pkg_postinst() {
+	xfce4_pkg_postinst
+	echo
+	echo "Hint:"
+	elog "Try launching with: exec ck-launch-session xfce4-session"
+	elog "from .xinitrc and startx in case of privilege issues."
+	echo
 }