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

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

commit:     76898763902ed2d8135397f4b7fdb03e7d133139
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 12:24:16 2012 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 12:24:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=76898763

xfce4-settings: Sync with gentoo-x86

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

---
 .../xfce4-settings/xfce4-settings-9999.ebuild      |   22 +++++--------------
 1 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index 39ce39d..f071f80 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.9.5.ebuild,v 1.2 2012/05/05 07:01:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.10.0.ebuild,v 1.9 2012/09/09 14:44:56 armin76 Exp $
 
 EAPI=4
 inherit xfconf
@@ -21,11 +21,11 @@ RDEPEND=">=dev-libs/dbus-glib-0.98
 	>=x11-libs/libXcursor-1.1
 	>=x11-libs/libXi-1.3
 	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.1.12
-	>=xfce-base/exo-0.7.3
-	>=xfce-base/libxfce4ui-4.9.2
-	>=xfce-base/libxfce4util-4.9.1
-	>=xfce-base/xfconf-4.9.1
+	>=xfce-base/garcon-0.2
+	>=xfce-base/exo-0.8
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/xfconf-4.10
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
@@ -46,13 +46,3 @@ pkg_setup() {
 
 	DOCS=( AUTHORS ChangeLog NEWS TODO )
 }
-
-src_prepare() {
-	local theme=Hicolor
-	has_version x11-themes/tango-icon-theme && theme=Tango
-	has_version x11-themes/gnome-icon-theme && theme=GNOME
-	has_version x11-themes/faenza-icon-theme && theme=Faenza
-	sed -i -e "/IconThemeName/s:Rodent:${theme}:" xfsettingsd/xsettings.xml || die
-
-	xfconf_src_prepare
-}