Moving necessary actions to postinst/postrm

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

5 files changed, 46 insertions, 19 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/Manifest b/app-office/texmacs/Manifest
index d33116884777..894600d137f8 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,16 +1,16 @@
 AUX TeXmacs.desktop 268 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825 SHA512 27bc36161b4b5c9b4e18659caaf3a5f2007f3ccb8e1200abb98a287c5540a60aa94bd3a4fb5c9469421f1e755c246ee7f3f489fbd9cb84a03bd73a6b4f40bbe3 WHIRLPOOL 3266496e18c7858827ec44ac5c28f2cbc1213d20fba469b019b59ff32d4a2905c623e2146dd289e4cd75c10ab0528ed4609a758a81310d32e9d5a2391f115b7e
 AUX texmacs-1.0.7.15-tm-files.patch 486 SHA256 4160cf9be7e8b70418d304b2085e0433acc3b6c820595d23e7c75f839cbc6cc6 SHA512 5eb71427c83fcef34b49d0d6a96734cc78924244e6090d0b9e644927da62f9fbfb9347556c924b3a3fa6d5f2272e8deb588bdda7e10f5ac9c80e1a3b4ee4968e WHIRLPOOL f82a41339ed27051d141632a9b997593f04609bf38cc60630321c5471363c67a11a812397faee6cf18ed24e0890fb66096d22ebf4e6f0391330f19c42c35813b
 AUX texmacs-ldflags.patch 3389 SHA256 23e0514e1bfaed93c60b0ceae050dd6dbf0dfebb43fb08712c4db5b6288d6b3a SHA512 628746aadbda6e7dbe2d9448093ddd672309957b871a277dd9bb7b17bee4a37240c21284c7541facfeefb6b512345567111fbc51e061207261de35eb5dafff24 WHIRLPOOL 53015c72b1f38332cf1503ec21f31f7b3e30a302cb3dadf0045e09d325221e6ef7e3e40b4945a020eb5ece20bdb60023459fd44845e5ff9a3493389b71b695e7
-AUX texmacs-mime.patch 608 SHA256 6871b76ba6e761c6a1aec3e86be2155f2d9e4136d92232addf5c27747c3c1e3c SHA512 3b6941aa5f3844ff77ff7fbff594da3a45f2ca2c09bf44209c70bce29683d73122d85e195e76939395b9d9d7bd55281826aef13c26634d76b037b6b7e357d09b WHIRLPOOL 6e698ec048dbd4a120ba3b53384beda8068f3a4e04910ee8025b9d6da2188309df515bad066a0057bc0b5d071a8479170acd6d483eb375c7548d2e92bf3ddad2
 AUX texmacs-mupad.patch 693 SHA256 c01e7c28847d0f66721438b764de66f806ec5980d4d27afb9ed4e0414364d714 SHA512 3b8a2e032b8f2bb78a6759d5c68a9c1a1b0934ac7b43079de3ccf8018ec3467f648494e8e31819e3983ea1d5888d26c8c8e5127f226ca9c0247f87964f395174 WHIRLPOOL 98ed405606d94edbd46de91cdabec77398285493e8a74b65fac34e2942d62c82f267a9e2a1c9ec393f6f6174a756f93ca4584dada1aad00fa90ab14a5b325a21
 AUX texmacs-plugins.patch 2924 SHA256 53e74c717e2e4d3b33e5b75af64b81213f68ece596b96206fffc42dc24732fbe SHA512 6cb115a4fb28482fee5000066c90e7d0efea87d6a30ee2acae87aea58d1482fd5cdbb207914d86a9a7917835224e1b9331b9a18cffcbe8f4937edf1e2e8e48d3 WHIRLPOOL a75d9031617c22d9d8369ddd28ed4dae49acc2ab9ceb2c5538eff0fab2639f956fad86a103d06125c846f301f8dd28c6c79b815d611a3fcc1f55e5cf7ce1bd6c
 AUX texmacs-strip.patch 710 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701 SHA512 3eff413d71c01d21da766c7780532360834b30450f9e09699f6f826b41d4f42075255773f056abed58d638c364947a77e2006faca648dc986325a464a4f4d638 WHIRLPOOL de7f8596f7a517bd0d7a0d397596ab2f0ca5e60ef76d4b480243523d3c90306aabab8054c0e7eb40c32d52c21ce0cc699a0647c5308e9a953c781edd6592b9bc
+AUX texmacs-updates.patch 1387 SHA256 40319fc736ac6a043b726c7551d76c77e71cc29d081282a3546875e4ee23f355 SHA512 209c5f64e21ae76fe41419101afb98ce4f61f040e9d29e3dbe37ec5bb0e16a1f3dd5aebe381db99e8d7278c5c36cd1654f78ba4af69e032670b1fdb62aafbda1 WHIRLPOOL 4802a89a411f0bf1acf892d6ec2882d8dc47615bbc77e44c28281267af126d740ec3af7bd2d561a38db1aa9251cf45c06c3da10cb2f2b4b213efba1caf4a5009
 DIST TeXmacs-1.0.7.15-src.tar.gz 15128281 SHA256 0a690de5e30a8fac6779767ebabe2f283f666e47b77e276e7dd2553578daabee SHA512 250a4df6d94663af22447bd5ba53df3c2df5e59e849f5fe8ee2ac656393f7e4cf66a7a56ffa7b6149457615ebae50ece23ec7d7a11c5ecaf674e5946cf5f012a WHIRLPOOL 079b66700d5e7e548f2ac25719913c49e1b2cc5a86a7e728d341e8388db840c2a3cba603ca0cec805c3baf08cca09777f33e35940731f5df5b9b2b8e8c275d0a
 DIST TeXmacs-1.0.7.16-src.tar.gz 15390090 SHA256 8bc402023f45a593578b83d2971f675eaa06463bd7f7b6b70fcf18415e585999 SHA512 bc0a3b86d5a1b6b2a6d1aec60630cac1056648ea0eda7ebd8f14adc867002065e078320093623f2cd1335f726370cc648c3349805624f4166bf47af4a386dbea WHIRLPOOL 462213c608fe8145fa662f654c47d262499c7900cc62de8d14802de9926656cc38a79d65631df19fb7a8457668bc6bc05b150bea510318a8c72107bb00e9f810
 DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba SHA512 e8ba14c8419de262c13e5eddc003ba0d341b4d570685526c73f0cf1bf437dcae86ac37952147b72b653eb66bcdd94f41eca9ff000f8f0fd80786ba13ee1b57fc WHIRLPOOL ca208be8c784e8a957421ce2b5db94958c38212c71ccb01d792ad9281bbabad3fd58a38e5ed48d8c2240a52e9c67b072080e277e631f210a1997ffd3f74bd8cc
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 SHA512 b04a9661a9b59aec46279fd78121e56b24fc66df821f62baa09df179958d3260bde04fc17e9c1dbbe186dbc39f4580f34858c1ed2c7549c8249c42ac81b27d28 WHIRLPOOL 5a29ff42d89fd54150effe0ef0b395ee09d37c098725455e80608f60395fb736597c249e6b1b76e68d05e5cc2eec6b8d0567c6f54cbd37d76f1b419b0884323c
 EBUILD texmacs-1.0.7.15-r1.ebuild 1401 SHA256 8c6a8852647cf916ca14520f089e94b692d98cb5edd9ab88b02c7785f632d863 SHA512 48b80fbc1372981dee912325b843da65f665fe66e7acb5772d2b8974e58fef95ee426ac103fd0da0e5defc4ed3ff1827f985b9ee8592516a9835143a266775d5 WHIRLPOOL 14e7b02ded2e89453e11fa49899fcec04b648141a9fd4cb1296712f0ca3068e562789575ed620d8aa400e8ac90640e77d9c1ee1256402c1a24b973bee20a2cfd
-EBUILD texmacs-1.0.7.16.ebuild 1568 SHA256 a2a5da459dce76e93b9c56cf82ee1e4186518003edfaf12a51196104efc932a4 SHA512 4e28afa9e2658a17913dcbcc1572a8e35a744c6ac3879944460d061c521d8532b91e9c511f7702139b5883ab5c51195f9413065a0b3d690c99ac0a5f4398e779 WHIRLPOOL a21ed8fa8e09c94811660c0e4322445b67f04c9a3646e1805aab832bdf59792f7e3d15d763fc76490d494cef0a5914ea61573102b0715e7cd50eef3fc1f2ac71
+EBUILD texmacs-1.0.7.16-r1.ebuild 1667 SHA256 1f6c6768329eaa46974e608b6efa3edb0f6c1c1b72d28c01a5545914a634b988 SHA512 c84242c1c407ee4773dd8edf5c8682439400dd7d605621e238d5519cd1aa54d175738026b6a5db0bf57ff655a1a734e27f7df9590fab0240822854ef7f9fa9a6 WHIRLPOOL 7613268aaf182f963a2583535ee6fe48c762016292fa00da842c5d1920b2cf05a794fcb977c3591dfcc27486ededce79eeb831eb7ba9e9c2a4f0e8c5d783a3cb
 EBUILD texmacs-1.0.7.2-r1.ebuild 1586 SHA256 b4dbd79fc46a5d95d6150af5b42b616156d4f5d4f66a3886bc54947571792d3b SHA512 2079385ad354f6b700621e8af6dbac083e20b45ac6620edeefffee8d6022afadac50cd38b50f22185b78f8f33b673c704f1dc1fc81c7f1ada73340fef8c8acd4 WHIRLPOOL e1d446ca28fac791b689034d26b383c952bac5c4fdd6d7d86c498745cdfc277848a472945fadf943195b9af34980e484ce55f0a06b077469ff117dcf91d04637
-MISC ChangeLog 17105 SHA256 399e268a57b8e28916aca6f2093cdb3aca99bac949e4e2e720ca186d53fbf223 SHA512 0419b549a343ddf28a5d79cf04a498b0bbfdc13f7fb314434a2ebb08a58fbd3c944729db95176fbc1f7f0f0db08c0a1d0456fb0ca756c327795cfc78254b99f2 WHIRLPOOL 07250bc60ec1e7d509c6b05cf78d645fb57ee68dd11eb11410ea09d5c55da1dc58f8e59dc97c82ab42f3643b527c88628eb7302d4829cca02db8c6cfd8819462
+MISC ChangeLog 17353 SHA256 cc55de16fb48e58275e839e3fc1adaa47960c0f3665457d747ff02d21e3fc687 SHA512 769efb6abb8efe007bad4d3357be32a302bb3e9ffbdd2c4a66efb1097be2a8ca8051c84c11d26245dbceba35f0a1d0a197a42c7757e2145942053fee2e0ebac7 WHIRLPOOL e87a42e4123d6dc52931f71bf26d6a1f06e42b0e5a4e5429bfed0e381a82201ebc9acd424d42fa8299fdb3fbbc1f82bbc800a798e2f1e7e92c537138471034a9
 MISC metadata.xml 346 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813 SHA512 9ab8a2b0a1e7cb32fcb5ec25c02ad474ab18773faa64b3707efdd702def41f23b1548850b65bdc70bc25d7c4d746268a61a89a3fe6837f696c61f7cc73595e00 WHIRLPOOL 2f2c3456ce0ea2d6516e21171169d3de3f5e2d0338d9aae019038b5904217c83fc8ab4a03ac95bbe2853b2a69380953a384a19ea1081d49f8c24b5809b30d249
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
 }