Restore USE="consolekit policykit udev" because bug 336146 was fixed upstream. Pass --disable-hal because it's obsolete and shouldn't be used anywhere.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

3 files changed, 21 insertions, 6 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 2befdab74582..60004fab3eaf 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.126 2011/01/02 15:15:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.127 2011/01/05 23:43:49 ssuominen Exp $
+
+  05 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-session-4.7.3.ebuild:
+  Restore USE="consolekit policykit udev" because bug 336146 was fixed
+  upstream. Pass --disable-hal because it's obsolete and shouldn't be used
+  anywhere.
 
 *xfce4-session-4.7.3 (02 Jan 2011)
 
diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml
index 1c65084e8484..a68f49e87893 100644
--- a/xfce-base/xfce4-session/metadata.xml
+++ b/xfce-base/xfce4-session/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
   <herd>xfce</herd>
   <use>
+    <flag name="consolekit">Enable support for sys-auth/consolekit</flag>
     <flag name="fortune">Install tips and tricks app (xfce4-tips), adds dependency on games-misc/fortune-mod</flag>
-    <flag name="gnome-keyring">Support for storing your password.</flag>
+    <flag name="gnome-keyring">Support for storing your password</flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-session/xfce4-session-4.7.3.ebuild b/xfce-base/xfce4-session/xfce4-session-4.7.3.ebuild
index bdf97c497921..598cfd19068a 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.7.3.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.3.ebuild,v 1.1 2011/01/02 15:15:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.3.ebuild,v 1.2 2011/01/05 23:43:49 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -12,9 +12,9 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug gnome gnome-keyring +xfce_plugins_logout"
+IUSE="consolekit debug gnome gnome-keyring policykit udev +xfce_plugins_logout"
 
-RDEPEND=">=dev-libs/dbus-glib-0.73
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.73
 	x11-apps/iceauth
 	x11-libs/libSM
 	>=x11-libs/libwnck-2.22
@@ -26,7 +26,11 @@ RDEPEND=">=dev-libs/dbus-glib-0.73
 	gnome? ( gnome-base/gconf )
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.7.2 )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+	policykit? ( sys-auth/polkit )
+	udev? ( sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
 	sys-devel/gettext"
@@ -40,6 +44,10 @@ pkg_setup() {
 		$(use_enable gnome)
 		$(use_enable gnome-keyring libgnome-keyring)
 		$(xfconf_use_debug)
+		--disable-hal
+		$(use_enable udev upower)
+		$(use_enable consolekit)
+		$(use_enable policykit polkit)
 		)
 
 	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"