summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-11-29 00:07:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-11-29 00:07:15 +0000
commitb1ee7df838eaae93de982c13fb7fbae403a3060d (patch)
tree90d740dd59754907360837aab98f602c8f8f07ea /xfce-base
parentRemove Qt 4.7.3 (diff)
downloadgentoo-2-b1ee7df838eaae93de982c13fb7fbae403a3060d.tar.gz
gentoo-2-b1ee7df838eaae93de982c13fb7fbae403a3060d.tar.bz2
gentoo-2-b1ee7df838eaae93de982c13fb7fbae403a3060d.zip
Be more smart about initial icon theme (tango, gnome, or faenza)
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-settings/ChangeLog6
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild9
2 files changed, 12 insertions, 3 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index b72dbe607990..bf0af16c84c2 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-settings
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.84 2011/11/26 18:02:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.85 2011/11/29 00:07:15 ssuominen Exp $
+
+ 29 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-settings-4.8.3.ebuild:
+ Be more smart about initial icon theme (tango, gnome, or faenza)
26 Nov 2011; Raúl Porcel <armin76@gentoo.org> xfce4-settings-4.8.3.ebuild:
alpha/ia64/sparc stable wrt #386963
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild
index 7bf00a4f05ad..a14f35892715 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.8.3.ebuild,v 1.6 2011/11/26 18:02:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.3.ebuild,v 1.7 2011/11/29 00:07:15 ssuominen Exp $
EAPI=4
inherit xfconf
@@ -49,6 +49,11 @@ pkg_setup() {
}
src_prepare() {
- sed -i -e '/IconThemeName/s:Rodent:Tango:' xfsettingsd/xsettings.xml || die
+ 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
}