Update icon caches after installation

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

3 files changed, 42 insertions, 10 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/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
+
+}