Update icon cache and desktop file database by Rick Harris (bug #334993).

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

3 files changed, 22 insertions, 5 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index d30819597d9a..75cccde75c68 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.580 2010/12/21 15:55:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.581 2010/12/22 16:14:34 jer Exp $
+
+  22 Dec 2010; Jeroen Roovers <jer@gentoo.org> opera-11.00.1156.ebuild:
+  Update icon cache and desktop file database by Rick Harris (bug #334993).
 
   21 Dec 2010; Jeroen Roovers <jer@gentoo.org> opera-11.00.1156.ebuild:
   Set PaX markings by Paulo Matias (bug #344267).
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index fe775eefa626..8cd499fb8c1f 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,7 +4,7 @@ DIST opera-11.00-1156.i386.linux.tar.bz2 11625554 RMD160 3955e17bbcb5be3244803a1
 DIST opera-11.00-1156.i386.linux.tar.xz 10032844 RMD160 a23f1bb734a0539a35739314f4c28e5187070663 SHA1 c0827b2b6a67b76cb6f75b036eb8d85621606a99 SHA256 c49a97d68569f63c543fd66a340c4719c0ea2fd5703c5b3f2ec0e4ff0dcb60ed
 DIST opera-11.00-1156.x86_64.linux.tar.bz2 12858732 RMD160 2d06fcd4f8ff3e03ebdfd982d17d436c74d5448c SHA1 53d001dd5e9afad32da78c158913d83ac027650f SHA256 46e6055369703acbab6ffebef321ca327e339d5f9a5dcd7e7ad909aa72d7b1c8
 DIST opera-11.00-1156.x86_64.linux.tar.xz 10736488 RMD160 feb61d84cff376e1a7bbc0378c584ca2aec20089 SHA1 1920c7ece83d94adfb1499443cc14be2c7e98154 SHA256 5b3a9a1c5cf54e5e28313e8b0b4238857a166232674688e888ca9bf52e0a9aed
-EBUILD opera-11.00.1156.ebuild 5671 RMD160 549912db0c76a06fc4293b6de7635cffd8671f5c SHA1 74debeada86a446f3471b76db77c3da0dfe23475 SHA256 5ca7f4e5bc23d3c460a2830eb51532814555fb463f44e751208b1d1731d7d249
+EBUILD opera-11.00.1156.ebuild 6003 RMD160 22d2bccd26f844d3c17b3a3f38979b3af1c9ef12 SHA1 0eca70604aa9bd556a3979bb15b00312a61c08cb SHA256 7b516ec85112bb25a8b6593c51d859c775ed3cdbbdb5b42da068a925d41c31da
 EBUILD opera-11.00_pre1156.ebuild 5323 RMD160 e5c15c36e11945f8e9d1e8c9d8c08bc9373de5c4 SHA1 c3e93e13a11edb96da1b1cc1558a384c83273b03 SHA256 6037158e91c5bf5a77d32a0e02d42f06f75b9cbc718f05efc4643906531bed58
-MISC ChangeLog 112141 RMD160 3160d7880d790f9c77f2ec9cb33f6a6c11ef5f46 SHA1 b7b93cb9fa82c767572e77263962ea1c9c12d32c SHA256 346f6b198a84990abaf74a8259418a82b8e4afa6c6165a829507f4a7fc8a5367
+MISC ChangeLog 112290 RMD160 249d48b50f85e10b642248a20d1bd95b32024e7e SHA1 7eeec45fe6d7c7b64b8dd6b52d82d5b2c543284f SHA256 00fda06a60e69f5b89887806127692d0dcafbb4052aaed23dcbc4e996c20ee22
 MISC metadata.xml 651 RMD160 5b15e2f22dc49ee158b4c76f4760219c1f85c096 SHA1 1de6dff612ef2667f194ed57d352e09a0879fbc1 SHA256 84accea33d9ad1436d9a425ddf5de328d31af559b7c9764d54546d3b357c7a10
diff --git a/www-client/opera/opera-11.00.1156.ebuild b/www-client/opera/opera-11.00.1156.ebuild
index 137549d2d55f..c9eff5d7145e 100644
--- a/www-client/opera/opera-11.00.1156.ebuild
+++ b/www-client/opera/opera-11.00.1156.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00.1156.ebuild,v 1.2 2010/12/21 15:55:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00.1156.ebuild,v 1.3 2010/12/22 16:14:34 jer Exp $
 
 EAPI="3"
 
-inherit eutils multilib pax-utils versionator
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
 
 DESCRIPTION="A standards-compliant graphical Web browser"
 HOMEPAGE="http://www.opera.com/"
@@ -201,6 +201,10 @@ src_install() {
 		"${D}/${OPREFIX}/opera/operapluginwrapper"
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
 	elog "[General] tab, click on [Details...] then [Choose...] and point the"
@@ -212,4 +216,14 @@ pkg_postinst() {
 		elog "To improve shared memory usage please set:"
 		elog "$ sysctl kern.ipc.shm_allow_removed=1"
 	fi
+
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
 }