Be more smart about initial icon theme (tango, gnome, or faenza)

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index b72dbe60799040ad626d4c7355d040efe32ce56a..bf0af16c84c256fc91717d791c2da026179c7abf 100644 (file)
--- 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/Manifest b/xfce-base/xfce4-settings/Manifest
index 1141356928bce128ee22417824c7075f792c5ece..0ef48e6016ed6b3dd679c1a12e2f32b19e6701bb 100644 (file)
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -6,13 +6,17 @@ DIST xfce4-settings-4.8.2.tar.bz2 668903 RMD160 cdc380442c732885a4305872b7e071e3
 DIST xfce4-settings-4.8.3.tar.bz2 672266 RMD160 37ee15874322b038948e496a0ff9ad25c7e6b219 SHA1 98431633ba3ec2a4a10182bc7266904d9256949b SHA256 d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e
 EBUILD xfce4-settings-4.8.1.ebuild 1548 RMD160 fea363f17b0ced1c4a191e47111e53a5b91c966f SHA1 7c50cb07257e6bd7b68040e692f3edca5d968ab9 SHA256 483900f2c3f33f2a2e04c7ae20e61daa61a60b34aeb9c890692df1a94ba88d95
 EBUILD xfce4-settings-4.8.2.ebuild 1546 RMD160 aea4d35131a4e465e7f9c420b9979b007317f388 SHA1 6f7bc8fda48b1be4749e169dc8f627e22f2e9aec SHA256 e29e8bbeba7c92fe25caa7cbc8cf7d7ac210aeaa74170d02b6f9cabbc6848d30
-EBUILD xfce4-settings-4.8.3.ebuild 1537 RMD160 6ac562db16dcb7543897f9b96aa2ee291b219e79 SHA1 3195eda73a9ef93fb6d89a465b926c597e48bd2d SHA256 34b2f7b4e78746b46a6e78c8052e85394eff05c02337bdaf11277078ee788963
-MISC ChangeLog 11214 RMD160 365c98b3e09cd09aee2412cc32d350372f1d9068 SHA1 d8cf285bb9682f10f1c0ec1fd76d0fe951c9d9a9 SHA256 43fdb3af48dca7970bae654c54d1741072c1e7817fda695be648eb6ef6008c83
+EBUILD xfce4-settings-4.8.3.ebuild 1734 RMD160 4663572b96a352cf08ac3ca49412d2e3e45eeba8 SHA1 aa5157d8016a0783d35b97a3d6008726f807158c SHA256 4b13ef0e6e9a9f36e7813aa917d5e28b78d67fdf2dbb616f8e5a5946b0d3222c
+MISC ChangeLog 11369 RMD160 20186c479b83947b9b0148a30c4ae187b766423e SHA1 4e47696fbe0c404a14d3e03ba99847619a493462 SHA256 d2c304e2d56ac595e4754d1d229113a703c70a53026493c4c7d040d694fda576
 MISC metadata.xml 391 RMD160 b281d2622300ce119f47945cc1c8ab91f57c2087 SHA1 44b496f42b7cc7e3924f58f16a63d52d9450b338 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7RKdQACgkQuQc30/atMkDq7gCglo5+rlqXPyMpOI7Io3BjH1rl
-2E0AoLiSbbYhoca5VwlxfdGQzk3WhFSn
-=fOu1
+iQEcBAEBAgAGBQJO1CGhAAoJEEdUh39IaPFNXVcH/33MA28t/eLW61cQ90j7Z2LS
+s1tuj+d+W/AhT9pp8ne4c3vKMpzkiQo9dLhEZEgF+PeSd/Y4L3OfI+dDVkUwjrUl
+zi2k3eS5jT9eosxCZenHip94BZpWl+GeCB3ZULrdcjjLFv0liaYqDHPWWJzOnw75
+gPKXX19FFQRJldyfCwVRaFXDI/J3nW3pN0Rdnn5qXkw9Hns4EIqRte8ldTZBEF1l
+6YLNVwqjlPN2vwDFLNCgLVW5G52OftWO6X5llYLnN8QyjHT14d/CsLpJfdnp+g5D
+x7SB7EU2zN9Km5RH8c3wFGWNcAuotu51nfx82L9SHykDa8DJ0qI3RegNkSE65pc=
+=YXnv
 -----END PGP SIGNATURE-----

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 7bf00a4f05adeba8f86983343f37e61d580154ed..a14f35892715556ecbe0e69c9bfb6abeec243025 100644 (file)
--- 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
 }