Moving necessary actions to postinst/postrm

(Portage version: 2.2.0_alpha128/cvs/Linux i686)

4 files changed, 43 insertions, 16 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 0a101c03282c..323d84b34222 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.104 2012/09/13 06:40:30 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.105 2012/09/16 04:52:45 grozin Exp $
+
+*texmacs-1.0.7.16-r1 (16 Sep 2012)
+
+  16 Sep 2012; Andrey Grozin <grozin@gentoo.org> -texmacs-1.0.7.16.ebuild,
+  +texmacs-1.0.7.16-r1.ebuild, +files/texmacs-updates.patch,
+  -files/texmacs-mime.patch:
+  Moving necessary actions to postinst/postrm
 
 *texmacs-1.0.7.16 (13 Sep 2012)
 
diff --git a/app-office/texmacs/files/texmacs-mime.patch b/app-office/texmacs/files/texmacs-mime.patch
deleted file mode 100644
index 6d572bf60ebe..000000000000
--- a/app-office/texmacs/files/texmacs-mime.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.16-src.orig/Makefile.in TeXmacs-1.0.7.16-src/Makefile.in
---- TeXmacs-1.0.7.16-src.orig/Makefile.in	2012-07-09 21:33:36.000000000 +0700
-+++ TeXmacs-1.0.7.16-src/Makefile.in	2012-09-13 12:27:29.000000000 +0700
-@@ -181,3 +181,2 @@
- 	$(CP) $(tmdir)/misc/mime/texmacs.xml $(DESTDIR)$(datadir)/mime/packages
--	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
- 	$(MKDIR) $(DESTDIR)$(datadir)/pixmaps
-@@ -228,3 +227,2 @@
- 	$(RM) $(datadir)/mime/packages/texmacs.xml
--	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
- 	$(RM) $(datadir)/pixmaps/TeXmacs.xpm
diff --git a/app-office/texmacs/files/texmacs-updates.patch b/app-office/texmacs/files/texmacs-updates.patch
new file mode 100644
index 000000000000..f9517cd25edc
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-updates.patch
@@ -0,0 +1,29 @@
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/Makefile.in TeXmacs-1.0.7.16-src/Makefile.in
+--- TeXmacs-1.0.7.16-src.orig/Makefile.in	2012-07-09 21:33:36.000000000 +0700
++++ TeXmacs-1.0.7.16-src/Makefile.in	2012-09-16 11:20:06.000000000 +0700
+@@ -171,3 +171,2 @@
+ 	$(DESTDIR)$(datadir)/applications
+-	@update-desktop-database 2>/dev/null || :
+ 	$(MKDIR) $(DESTDIR)$(datadir)/application-registry
+@@ -181,3 +180,2 @@
+ 	$(CP) $(tmdir)/misc/mime/texmacs.xml $(DESTDIR)$(datadir)/mime/packages
+-	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
+ 	$(MKDIR) $(DESTDIR)$(datadir)/pixmaps
+@@ -193,4 +191,2 @@
+ 	$(DESTDIR)$(datadir)/icons/gnome/scalable/mimetypes
+-	@gtk-update-icon-cache -t --force \
+-		$(DESTDIR)$(datadir)/icons/gnome 2>/dev/null || :
+ 	@echo installed TeXmacs mime info in $(DESTDIR)$(datadir)
+@@ -223,3 +219,2 @@
+ 	$(RM) $(datadir)/applications/texmacs.desktop
+-	@update-desktop-database 2>/dev/null || :
+ 	$(RM) $(datadir)/application-registry/texmacs.applications
+@@ -228,3 +223,2 @@
+ 	$(RM) $(datadir)/mime/packages/texmacs.xml
+-	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
+ 	$(RM) $(datadir)/pixmaps/TeXmacs.xpm
+@@ -232,4 +226,2 @@
+ 	$(RM) $(datadir)/icons/gnome/scalable/mimetypes/text-texmacs.svg
+-	@gtk-update-icon-cache -t --force \
+-		$(DESTDIR)$(datadir)/icons/gnome 2>/dev/null || :
+ 	@echo removed TeXmacs mime info from $(datadir)
diff --git a/app-office/texmacs/texmacs-1.0.7.16.ebuild b/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
index 9c530dba4143..8ddbac582f87 100644
--- a/app-office/texmacs/texmacs-1.0.7.16.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.16.ebuild,v 1.1 2012/09/13 06:40:30 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild,v 1.1 2012/09/16 04:52:45 grozin Exp $
 
 EAPI=4
 
-inherit autotools eutils fdo-mime
+inherit autotools eutils fdo-mime gnome2-utils
 
 MY_P=${P/tex/TeX}-src
 
@@ -38,8 +38,8 @@ src_prepare() {
 	# respect LDFLAGS, bug #338459
 	epatch "${FILESDIR}"/${PN}-plugins.patch
 
-	# dont update mime database
-	epatch "${FILESDIR}"/${PN}-mime.patch
+	# dont update mime and desktop databases and icon cache
+	epatch "${FILESDIR}"/${PN}-updates.patch
 
 	eautoreconf
 }
@@ -59,9 +59,11 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }