Use xfconf.eclass. Missing USE gnome-keyring.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 40 insertions, 21 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 0f44001422dc..98015c505297 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.94 2009/07/27 17:46:53 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.95 2009/08/02 08:18:38 ssuominen Exp $
+
+  02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-session-4.6.1.ebuild, metadata.xml:
+  Use xfconf.eclass. Missing USE gnome-keyring.
 
   27 Jul 2009; nixnut <nixnut@gentoo.org> xfce4-session-4.6.1.ebuild:
   ppc stable #265587
diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml
index 826e2ca93209..83abf5f159ed 100644
--- a/xfce-base/xfce4-session/metadata.xml
+++ b/xfce-base/xfce4-session/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="gnome-keyring">Support for storing your password.</flag>
+	</use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-session/xfce4-session-4.6.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.6.1.ebuild
index 523e9db2f0a7..e52dfb4e8995 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.6.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.6.1.ebuild
@@ -1,35 +1,47 @@
 # Copyright 1999-2009 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.6.1.ebuild,v 1.10 2009/07/27 17:46:53 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.6.1.ebuild,v 1.11 2009/08/02 08:18:38 ssuominen Exp $
 
-inherit xfce4
+EAPI=2
+inherit flag-o-matic xfconf
 
-xfce4_core
-
-DESCRIPTION="Session manager"
+DESCRIPTION="Session manager for Xfce4"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
+
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug gnome"
+IUSE="debug gnome gnome-keyring profile"
 
 RDEPEND="gnome-base/libglade
-	dev-libs/dbus-glib
-	sys-apps/dbus
+	>=dev-libs/dbus-glib-0.73
 	x11-libs/libX11
 	x11-libs/libSM
-	x11-libs/libwnck
+	>=x11-libs/libwnck-2.12
 	x11-apps/iceauth
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	>=xfce-base/xfce-utils-${XFCE_VERSION}
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	>=xfce-base/xfce-utils-4.6
 	games-misc/fortune-mod
-	gnome? ( gnome-base/gconf
-		gnome-base/gnome-keyring )"
+	gnome? ( gnome-base/gconf )
+	gnome-keyring? ( gnome-base/gnome-keyring )"
 DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable gnome)"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable gnome)
+		$(use_enable gnome-keyring libgnome-keyring)
+		$(use_enable debug)
+		$(use_enable profile profiling)
+		$(use_enable profile gcov)"
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}
+
+src_configure() {
+	use profile && filter-flags -fomit-frame-pointer
+	xfconf_src_configure
 }