Update icon caches after installation

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

4 files changed, 45 insertions, 33 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 873566563270..fa393172b5f9 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.19 2011/03/16 11:09:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.20 2011/03/16 21:54:22 suka Exp $
+
+  16 Mar 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.1.ebuild,
+  libreoffice-3.3.2_rc1.ebuild:
+  Update icon caches after installation
 
   16 Mar 2011; Markos Chandras <hwoarang@gentoo.org> libreoffice-3.3.1.ebuild:
   Stable on amd64 wrt bug #358907
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 362d8100a887..6adecdc18ae0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
@@ -113,24 +110,7 @@ DIST libreoffice-ure-3.3.2.1.tar.bz2 6163238 RMD160 eed17fdf276dfc1805619e78e872
 DIST libreoffice-writer-3.3.1.2.tar.bz2 6776894 RMD160 7667f4fbbe8d6eea2dd8b8fef84bc7152d2a4738 SHA1 17fc2d585da2eb948c5ce7951d112d238a9b124c SHA256 2a1d8836eaa738a4378bbab27accb2d6af1218a6d601354558adb12f2342509b
 DIST libreoffice-writer-3.3.2.1.tar.bz2 6778755 RMD160 e28c2590a98448de4be7de3b90b550f2e280bcbc SHA1 714ea69b859858d7feaaf67aacd54ee86400cd2a SHA256 477626d65375a61c21174e5f4dbdd54ac2950984f1c1b22adedd9d6d8446fcd6
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.1.ebuild 18339 RMD160 eaad3e239049ece06f77b7ca40791817167eb99e SHA1 05e882eaebef8be286e1f61518729528f21b02de SHA256 352fdaed5e2c8ee2521f50d72620da78fc88044d92892f8ecbafdd2d255c8329
-EBUILD libreoffice-3.3.2_rc1.ebuild 18340 RMD160 76228b634312abc9c70e11324b19bdbf98746bcc SHA1 b8975dd155cdb6d5c981fcdf1433d5246130a941 SHA256 5d81a28f570917f3280605731718ec992accc1b8a2859cd4d7720d76ee93a773
-MISC ChangeLog 4142 RMD160 0c2050541375803fc06a2720dc4e423405b51d18 SHA1 563cd9fe039f39ec4116da0741bf429ea7c8782f SHA256 63ec2adf9ac3df2df577b4ce596bf80fbb14b972defbae68303c01ba45d34c16
+EBUILD libreoffice-3.3.1.ebuild 18602 RMD160 f77a4fc9f698b4b681fca7dc34b340d32bf0a1fb SHA1 eaa685fc4f550ddd2d34642123e5063af6f3f510 SHA256 76b82d8f01d652585a9d618945eb2fa5c5d502623c87161f08bbde7876f24923
+EBUILD libreoffice-3.3.2_rc1.ebuild 18500 RMD160 f08ad866a8ab777c00516ffcac92361dd927d32d SHA1 410895d7791d16698e6a22137f58b0a4320b31a0 SHA256 686039b2f512591a349529e571ee888a4413fef1fcf2e6a3890728c1152d06c5
+MISC ChangeLog 4290 RMD160 868e430b6474d29b29c8ccce6c7352d6e9e546aa SHA1 1a7aeaefedcc4d4d42bdd287e1db2ebec9182f4d SHA256 9e8efede1f093b059fc4b32e63ebad07b251a063f194c6931a2fbe1542da4686
 MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNgJpqAAoJEPqDWhW0r/LCMHwP/18TcQlqE5Q421ScWrDKVQ/l
-jHhVCHFurBi6JltyBHH6Ts/8kkdNmrwGRzeB1Ht4xt6povUO908rDCGsq5RhYPXT
-f3jh9NHJPrXcpX5CEwDxjQ06jCaw4dj69Qt1aVWjv9I+hFZT3Is01IXLTUtE8HX2
-c+x5RqTX5Ow2hDQxNcX1/q34bmnTCOca/FKdSIcAQSIfoKGEXZXrUUivQ89KwJvk
-QCDTLWRwFt3C0jRYNdpqhQiznklHzLv46SlcvvXP86X9up18YzT15Cz5xlpQX//t
-BU/tg9eovuQTiuamGbuqnAkiSewxma2pGCgNOaPS4SMV2Aq+EeIBhlP3dA2tdotY
-mNvArC+QiV/qMkETTru4v8eUDLgc4m6fiyWpCu9oGAaBEXYQc4e4Z4588UGKQIUw
-FFH+4gd2bvbsbzns4l6tfD64nLdRW1bLIT3sQAikuiFyBHWbd6/Od7sJCY3V5God
-q4ukAXnH34illM+kVT1gj31RNIwAyKPtTjtA3MzjJ23RA+pwt+Pjhm0OqTO1VGCk
-e+YtbzZbcn3IfZr0Nh1EjhudGnBPxAtaMfNS0KTxHvwBDS3ODgODYFN04FcAc7By
-6sDMEJ9qxu0qDkUaAq2uPpEHzHZ/hrkehAilbGqbCLTZospN0xsnkvYlm6051h1X
-RYFEkxQzQw9bqdIFthy3
-=1jS4
------END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.3.1.ebuild b/app-office/libreoffice/libreoffice-3.3.1.ebuild
index d96751430a24..23c3f51837e1 100644
--- a/app-office/libreoffice/libreoffice-3.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.1.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/app-office/libreoffice/libreoffice-3.3.1.ebuild,v 1.5 2011/03/16 11:09:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.1.ebuild,v 1.6 2011/03/16 21:54:22 suka Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ CMAKE_REQUIRED="never"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads"
 
-inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
 
@@ -432,10 +432,19 @@ src_install() {
 
 }
 
+pkg_preinst() {
+
+	{ use gtk || use gnome; } && gnome2_icon_savelist
+
+}
+
 pkg_postinst() {
 
+	# Cache updates
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	{ use gtk || use gnome; } && gnome2_icon_cache_update
+
 	BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
@@ -446,3 +455,10 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 }
+
+pkg_postrm() {
+
+	fdo-mime_desktop_database_update
+	{ use gtk || use gnome; } && gnome2_icon_cache_update
+
+}
diff --git a/app-office/libreoffice/libreoffice-3.3.2_rc1.ebuild b/app-office/libreoffice/libreoffice-3.3.2_rc1.ebuild
index 0908f4a61688..46f220e6117f 100644
--- a/app-office/libreoffice/libreoffice-3.3.2_rc1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.2_rc1.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/app-office/libreoffice/libreoffice-3.3.2_rc1.ebuild,v 1.1 2011/03/13 19:31:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2_rc1.ebuild,v 1.2 2011/03/16 21:54:22 suka Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ CMAKE_REQUIRED="never"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads"
 
-inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
 
@@ -266,8 +266,7 @@ src_prepare() {
 		die
 	fi
 
-	#Some fixes for our patchset
-	cd "${S}"
+	# Some fixes for our patchset
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/env_log.diff"
@@ -360,9 +359,6 @@ src_configure() {
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi
 
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
 	# Now for our optimization flags ...
 	export ARCH_FLAGS="${CXXFLAGS}"
 	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
@@ -432,10 +428,19 @@ src_install() {
 
 }
 
+pkg_preinst() {
+
+	{ use gtk || use gnome; } && gnome2_icon_savelist
+
+}
+
 pkg_postinst() {
 
+	# Cache updates
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	{ use gtk || use gnome; } && gnome2_icon_cache_update
+
 	BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
@@ -446,3 +451,10 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 }
+
+pkg_postrm() {
+
+	fdo-mime_desktop_database_update
+	{ use gtk || use gnome; } && gnome2_icon_cache_update
+
+}