[gentoo-commits] proj/xfce:master commit in: xfce-base/xfce4-session/

[Christoph Mende]

commit:     0a1738b43073d70ffe42b8d7a2b03b935e18b84e
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 15:26:35 2012 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 15:26:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=0a1738b4

xfce4-session: Sync with gentoo-x86

(Portage version: 2.2.0_alpha96/git/Linux x86_64, signed Manifest commit with key 84F20B43)

---
 xfce-base/xfce4-session/xfce4-session-9999.ebuild |   28 +++++++-------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
index 3d14561..df7e625 100644
--- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
@@ -1,32 +1,30 @@
 # Copyright 1999-2012 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.8.3-r1.ebuild,v 1.2 2012/02/24 11:43:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.9.0.ebuild,v 1.1 2012/03/31 05:49:28 ssuominen Exp $
 
 EAPI=4
 inherit xfconf
 
-DESCRIPTION="Xfce's session manager"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="consolekit debug gnome-keyring policykit udev +xfce_plugins_logout"
+IUSE="consolekit debug gnome-keyring udev"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.92
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
 	x11-apps/iceauth
 	x11-libs/libSM
 	>=x11-libs/libwnck-2.22:1
 	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/xfconf-4.8
-	>=xfce-base/xfce-utils-4.8
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )"
+	>=xfce-base/libxfce4util-4.9
+	>=xfce-base/libxfce4ui-4.9
+	>=xfce-base/xfconf-4.9
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-2.22 )
+	!xfce-base/xfce-utils"
 RDEPEND="${COMMON_DEPEND}
 	consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
-	policykit? ( >=sys-auth/polkit-0.102 )
 	udev? ( sys-power/upower )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
@@ -36,14 +34,8 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	XFCONF=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-static
-		$(use_enable xfce_plugins_logout panel-plugin)
 		$(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 )