Use xfconf.eclass. Missing USE gnome-keyring.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 43 insertions, 24 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/Manifest b/xfce-base/xfce4-session/Manifest
index e4ef8e6262a3..c9f01f644c5a 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,6 @@
 DIST xfce4-session-4.4.3.tar.bz2 1276089 RMD160 e0aa16b9089ae00a34f5e1df5b1b9af7a104f922 SHA1 609cf888548e1dc7f2b2318698ab86ac73fb0f4d SHA256 fa23d0e079ea3bf1b7f0e056adc6e28df04581632207face4f851269d92bffdd
 DIST xfce4-session-4.6.1.tar.bz2 1365247 RMD160 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0 SHA1 760e05bf73783521b3ce34e91aa187c74018ab8c SHA256 feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
 EBUILD xfce4-session-4.4.3.ebuild 1037 RMD160 d3a87d4420e41ea252de4f1c137d405b0b0c9323 SHA1 9d0d09fd401e5c17359bc572de8f575587752ce8 SHA256 7568daf0501682895f9cb3a793b3b1e646ef269f8adbb4dd97e7a70d5dd5c65f
-EBUILD xfce4-session-4.6.1.ebuild 947 RMD160 2aec9fed61d6b048075d43546a21d43a3f5da21b SHA1 23c9a9a3c23dfd0c852e1926398684d5381c341f SHA256 c7310e2c1d3082b35ec8f2e6d268ab8241162fdcedabb6da3d87b0b5c8cd6ad2
-MISC ChangeLog 11810 RMD160 801cef35e4a628e7ed3bf1b50082d551c0c28596 SHA1 f6f26527e2e7e02ef9afb0d4ea35f4e985be18e9 SHA256 5bc1d0babc1546446250861256806b17462a0db5d35c4579edaaf46dbc503370
-MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
+EBUILD xfce4-session-4.6.1.ebuild 1275 RMD160 8d8c3495c16b87aeebaf50872f279bb01af0f687 SHA1 7efda2bc5e7efebed20896963c32670de8c08999 SHA256 42c99f8e729551fa1b44956a26f30bac1e720c4349bfa8659313d1914970a199
+MISC ChangeLog 11960 RMD160 0416156997ea8d48e810e9323a8a26259d42c31a SHA1 d82596c0aee2a8ef8ec41d9f2badc46761343c18 SHA256 118ea494f30b716b5dd5cedfdaac57c7c7bf2eef9f975a5e3caef6eb00024e2d
+MISC metadata.xml 244 RMD160 90c73dd09b35d530e6f4378748de35cde85f10fa SHA1 95958bea917e628d01b3e458d65dab0ce1950613 SHA256 f0402278ccebaff50df5e59436d57de8bc99581ceb131ec48ef1347fa482127f
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
 }