Do not pick trayicon from icon theme but use hardcoded path to filename. Bug #340813

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

3 files changed, 20 insertions, 7 deletions

diff --git a/x11-misc/shutter/ChangeLog b/x11-misc/shutter/ChangeLog
index 16a9c97bf8d0..1f7c2b14c8ca 100644
--- a/x11-misc/shutter/ChangeLog
+++ b/x11-misc/shutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/shutter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.14 2010/10/10 10:36:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/ChangeLog,v 1.15 2010/10/15 10:56:01 hwoarang Exp $
+
+*shutter-0.86.4-r1 (15 Oct 2010)
+
+  15 Oct 2010; Markos Chandras <hwoarang@gentoo.org> -shutter-0.86.4.ebuild,
+  +shutter-0.86.4-r1.ebuild:
+  Do not pick trayicon from icon theme but use hardcoded path to filename.
+  Bug #340813
 
 *shutter-0.86.4 (10 Oct 2010)
 
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index d423bf3df14e..01e7b710a743 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -7,13 +7,13 @@ AUX disable_webphoto.patch 505 RMD160 6dc5ae131e99d07f80c88eeb8410216aa177ac40 S
 DIST shutter-0.86.2.tar.gz 2600055 RMD160 3b953f7aa8630b1173a49cbddb1d5d54996f57f7 SHA1 0dfd3771582f97f55bd5a8dbba78a5900a7c132b SHA256 3dadec6bca407cfc4c7976d78398b064dad428346a78e838cf4c677e4d22a67c
 DIST shutter-0.86.4.tar.gz 2813078 RMD160 25163015f81a8ded4c895eef2e2acdc65bbdf443 SHA1 b27264161aaa272d52871bc3d4ea3959c9829412 SHA256 44c4787117ef7f1a1251cc394f93947a8b3399a9ea7887dd3bb1ec1dbc89b557
 EBUILD shutter-0.86.2.ebuild 1757 RMD160 fe6c3b556354412839758ac0b8d935726dda54a1 SHA1 a5d08b565d1f8074a4fa636db20a407a325edb1d SHA256 d3592ba78483a09ea608a612bab4b15ee6006a73b6593d1f7c7cb3a915e3bc79
-EBUILD shutter-0.86.4.ebuild 1768 RMD160 2682ab6603cd450512e509746b5321de26f4c973 SHA1 64e50b7c6df61ce8cbe9c6af12b0470d52f360ab SHA256 5419f0a05d29d13099a24b3ad373b0426f808870aa774554cd2618addbb0d5b8
-MISC ChangeLog 2347 RMD160 0c2e04b2966e87f95dde455dd65fa94eff543443 SHA1 a3088fb257558e50fa7f5bde2f69631bb1ff8044 SHA256 22379832eb9c453b7822cf46dd3156b1088dfd837da15b5faab2a29ad3bd656b
+EBUILD shutter-0.86.4-r1.ebuild 2129 RMD160 199df88ea30aa61166c6e08d0771e75b03e10084 SHA1 d6d491e27fe6bddab5fa3fa311378b5ea4b82835 SHA256 1e91a8f0770e6de1839c9418bc5da71e9c1530675a3e0a60dd2b9d5251616330
+MISC ChangeLog 2577 RMD160 02c776e6a476d0b65a16a1059fe85b43e5f94401 SHA1 a11e39e1689b733e938d8a877e51b4a98e2f8179 SHA256 ee059127975a2e156237c8d39270b3108f51538316120df3460cbdde83809fbf
 MISC metadata.xml 425 RMD160 c1adebdaded3f7258c266b8175c8b7c4b54f06da SHA1 7042350e8d4f930a10d8f2944f781e13771dd3f0 SHA256 731c700f782bc244fa366f95b38011977ee075dc53540d47c655c65730ce8716
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyxlqUACgkQ9/cejkQaxBBI1QCeLD1WZ8H8JejHLRSAbCcLR0Il
-978An1TZ7juzdnqblY2T0+6lSQqJ2yHf
-=nVwT
+iEYEARECAAYFAky4MzkACgkQ9/cejkQaxBAC6ACfQXxgCS5jCF06PfzheqccvTQm
+proAn1oNa9wJCYvR84A7EuAATgvRVDWW
+=vcyu
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/shutter/shutter-0.86.4.ebuild b/x11-misc/shutter/shutter-0.86.4-r1.ebuild
index a4e4786c9f58..19902df5bf81 100644
--- a/x11-misc/shutter/shutter-0.86.4.ebuild
+++ b/x11-misc/shutter/shutter-0.86.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.86.4.ebuild,v 1.1 2010/10/10 10:36:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shutter/shutter-0.86.4-r1.ebuild,v 1.1 2010/10/15 10:56:01 hwoarang Exp $
 
 EAPI="2"
 
@@ -43,6 +43,10 @@ RDEPEND="dev-lang/perl
 src_prepare() {
 	use webphoto || epatch "${FILESDIR}"/disable_webphoto.patch
 	use drawing || epatch "${FILESDIR}"/${PV}-disable-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
 }
 
 src_install() {
@@ -54,6 +58,8 @@ src_install() {
 	doman share/man/man1/${PN}.1.gz || die "doman failed"
 	doicon share/pixmaps/${PN}.png
 	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
 	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
 		|| die "failed to make plugins executables"
 }