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

["Christoph Mende" <angelos@gentoo.org>]

commit:     b2ee34f7695083b4601efc70b0182a6ef8bf1cea
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 19:37:40 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 19:37:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=b2ee34f7

xfce4-settings: Updated

---
 xfce-base/xfce4-settings/metadata.xml              |    4 +-
 .../xfce4-settings/xfce4-settings-9999.ebuild      |   40 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml
index 84d44f1..e2ceec9 100644
--- a/xfce-base/xfce4-settings/metadata.xml
+++ b/xfce-base/xfce4-settings/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>xfce</herd>
 <use>
-	<flag name='sound'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag>
-	<flag name='keyboard'>Enable Keyboard layout selection with <pkg>x11-libs/libxklavier</pkg></flag>
+	<flag name='libcanberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
+	<flag name='xklavier'>Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index f9fc73f..a46dc95 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=3
 inherit xfce4
 
 xfce4_core
 
-DESCRIPTION="Settings daemon for Xfce4"
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-settings/"
 
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug +keyboard libnotify sound"
+IUSE="debug libcanberra libnotify +xklavier"
 
 RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.34
+	>=dev-libs/dbus-glib-0.88
 	>=gnome-base/libglade-2
 	>=x11-libs/gtk+-2.14:2
 	>=x11-libs/libX11-1
 	>=x11-libs/libXcursor-1.1
 	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.1
-	>=x11-libs/libwnck-2.12
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfce4ui-4.7
-	>=xfce-base/xfconf-4.6
-	>=xfce-base/exo-0.5
-	!<x11-base/xorg-server-1.5.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/xfconf-4.8
+	>=xfce-base/exo-0.6
+	libcanberra? ( 	>=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.1.3 )
-	keyboard? ( >=x11-libs/libxklavier-0.3 )
-	sound? ( media-libs/libcanberra )"
+	xklavier? ( >=x11-libs/libxklavier-0.3 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	x11-proto/inputproto
-	x11-proto/xf86vidmodeproto"
+	sys-devel/gettext
+	>=x11-proto/inputproto-1.4
+	x11-proto/xproto"
 
 pkg_setup() {
 	XFCE_CONFIG+=" --disable-dependency-tracking
 		--disable-static
 		$(use_enable libnotify)
-		$(use_enable keyboard libxklavier)
-		$(use_enable sound sound-settings)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+		$(use_enable xklavier libxklavier)
+		$(use_enable libcanberra sound-settings)"
+	DOCS="AUTHORS NEWS README TODO"
 }