Version bump; removed unused erroneous file in 1.0.7.16-r1 (closing #459430)

Package-Manager: portage-2.2.0_alpha169/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

6 files changed, 53 insertions, 92 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index ba9333f62f28..9b280619370c 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.106 2013/03/02 19:37:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.107 2013/03/23 10:01:03 grozin Exp $
+
+*texmacs-1.0.7.18 (23 Mar 2013)
+
+  23 Mar 2013; Andrey Grozin <grozin@gentoo.org> -texmacs-1.0.7.15-r1.ebuild,
+  -files/texmacs-1.0.7.15-tm-files.patch, texmacs-1.0.7.16-r1.ebuild,
+  +texmacs-1.0.7.18.ebuild, -files/texmacs-ldflags.patch:
+  Version bump; removed unused erroneous file in 1.0.7.16-r1 (closing #459430)
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> texmacs-1.0.7.15-r1.ebuild,
   texmacs-1.0.7.16-r1.ebuild:
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 7f42787c8e84..d28f529600d9 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -2,37 +2,35 @@
 Hash: SHA256
 
 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-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.18-src.tar.gz 18532552 SHA256 5a821eeef8a2dff302f008f326c7d8a0e483ab51d3341fbd7a028d9aa724ffeb SHA512 9e007801b438686b8a5ab372472c1b53a6b6970f334103d7222c6a8ff9cc658e1d1269eeb09692767080eda9751f2f9872adbc686b2b7a16035f4b8c55717719 WHIRLPOOL b97897b1992781a0a8b13c95dc6e5cae066e80589c9bd3a9cb222384c4d30ae812c72cdd8045c7a73f2aaa8e97aff03b2cd3fedb8fc2a92f37375d556941432b
 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 1396 SHA256 9184ddfa2db318a0cb0a92829f600804864b3e695bb9ed0d1ed5a1a65f60bde9 SHA512 b32c91bfe6143b6750b782eca6d0d39f6a3a20e94b30684e803beaab7d05447100816d4392efbcae6c5f986e0784bead2cbb4557d21b6231fb7aa6153bd8b376 WHIRLPOOL 6150c226cc6e0639959f37827a6beee0d4d3d63e5d846c33dfffdb73f07abe6421cc6b1b1959b30a1f541cf8d608b8dd381af97658907673339cf288a4d59e71
-EBUILD texmacs-1.0.7.16-r1.ebuild 1666 SHA256 485b2c54a0ce48d167d6a71b7861d6fc5c8ead17244a84ff128a85bc8f9a12b3 SHA512 d27b27a9778a2f20f895de38cbc59762150f718d6bda51cb55bed9e1ebbdf2de99b7150151cd22972c0ca09c6ee3b952e880d481bf1c9bea5d278550e6b0bee0 WHIRLPOOL 664743778ccfac974b06dc50c361fc1c096ab330a01de40ae77e1754da159724d077f18b9257cec3435ece7680350d334f997f82ff42934ea4132761946d651e
+EBUILD texmacs-1.0.7.16-r1.ebuild 1757 SHA256 1f29ce6fa1093c23810e05a2e8e2a2088f2e8b6ba980396459838c0ffb5f9fbd SHA512 16e98376b5cfcde53dfd6df14ece432723570e6dd39e86eddc2afe8de85c94016c8544c26a6172c1548ea5e52c420383bc9dafaa48fbbb7cdcc691a49a0efcaf WHIRLPOOL a1b9cd5956a30285fd1ce83de9045b80f0623146c0d2a1fedb2a5f51e0afe2640cd69dbb89ceca02c8779883ac2d486e2ddb790cede00d2bca73316122368baf
+EBUILD texmacs-1.0.7.18.ebuild 1831 SHA256 b225d6550fc80b1c4611ac7beada9e6b41a44e409cd54e85261506eea00f3bcf SHA512 0aa1658eaef74dd9cb2e5d3e49ce8dbd831d8feabdc42fab2ef6c8c04f973552b59e5a080be72a417b8d91fe2b17274b186d57cc7b06137b3bf00125945e414d WHIRLPOOL 4d0dcf585b060accf7bde35473daa272f9cc8f8120f25ab99011852a09144c5dd42797f0c5384d7e98ffdadda8585c1fecb3927bf64e56032ee48f6d9b58ccb2
 EBUILD texmacs-1.0.7.2-r1.ebuild 1586 SHA256 b4dbd79fc46a5d95d6150af5b42b616156d4f5d4f66a3886bc54947571792d3b SHA512 2079385ad354f6b700621e8af6dbac083e20b45ac6620edeefffee8d6022afadac50cd38b50f22185b78f8f33b673c704f1dc1fc81c7f1ada73340fef8c8acd4 WHIRLPOOL e1d446ca28fac791b689034d26b383c952bac5c4fdd6d7d86c498745cdfc277848a472945fadf943195b9af34980e484ce55f0a06b077469ff117dcf91d04637
-MISC ChangeLog 17510 SHA256 792bc1f00f007fba298fe9f4c1e421ca4c497e8e2ae788b7340bf5914d929a07 SHA512 f62237d6eefaf41625683da39a143ca5cac0066e82b2539f92424e46dfeb746011ce005da03ff8fa131349cd436dfd8637d1976b3ea19c5bc2e645cacaa80f00 WHIRLPOOL 0fd6c8ea549e842a68821202efa8ad4edf246eb7961d0faa1bdcd2eecf5abce039d6eae216b2ca4605b49d29577b4ae0d6b5fc9931c6e216e21cbb8f242600af
+MISC ChangeLog 17827 SHA256 ff1b9e4c691239133b01d8ac5806a6c5de749d132f692ab109b6e67bf338fad5 SHA512 65d95d2a5c803b8ed73e42addbed5f4019601f9924b67900bd36ac75556c9116a52aeb4efcfc237185cfc4bba7659accc5e0d5b9e53fe8a8acef9cc75d8aecb2 WHIRLPOOL 011edf8c2c429f7112c17ea808e3d279b714c13ac6ec10a1cf6907e02e436dc0ddcaa16b14839e540d5bf9f13e9dc474e451366afa8b212ef86b326132118808
 MISC metadata.xml 346 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813 SHA512 9ab8a2b0a1e7cb32fcb5ec25c02ad474ab18773faa64b3707efdd702def41f23b1548850b65bdc70bc25d7c4d746268a61a89a3fe6837f696c61f7cc73595e00 WHIRLPOOL 2f2c3456ce0ea2d6516e21171169d3de3f5e2d0338d9aae019038b5904217c83fc8ab4a03ac95bbe2853b2a69380953a384a19ea1081d49f8c24b5809b30d249
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMlUQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88CVgP/RexTaq0PN7frX7K7q6bwkDr
-7Y3tcnmimpASPtjOjpCpbgwE1Lryn0BIJddhYFBzaBabGrYQLtVJyh0TuQ2PpxJH
-dfNOO6146XK26+ABxorKbFJQjRVzRM9n42iTXqFL2n+9dSlZ8xC1/4wynyMJTnQ6
-/p4PP9xhVCeu6cfG/9RagrK/WGvCpgiR3iOmqwFmhWsty9ttFo63lH4otVjVdrkN
-27O0dmCWXE+BVG/FK+WIxXPQ6X6aXO/XTK2KYyL/yLenDjm6qQxSaUIVWwz6YSRr
-X8E+dCpwMozUgFH+dnLFeDTg8nE1J+56AVIJImnPaCZ6tiBKQDoiaZ0qGA2+vkHb
-WncHEdXqyU3elchKe+RXEKFH5HVrftRn0W145Kii6K5ydy2Irn7Iok8cXJcbMCWS
-12iwENesSF38KrmizTZ/LdOS0Hgpwg20Mo/4u/4TeoT8Sb7+KvMSFY/3inHfx5Gl
-7IN5R20EVl0HTs1TKH/eSSExqrTqLCzAcO8xY/lg/CwMVA/6vPFQSLPVLtiMcAom
-Y4Y5W8SNKjBy5C5b7N9C7Op/FYEoaGpSwu7MvSC5F2gDzqm+sraYmShiEntnsUtG
-GCgi8GPoDX+cny/mrHF6d5FIcR2Ii5exPyU4ImJZY7HmOBP3GA7Qi4JMtpwvL0IL
-qfHADlJEC6xITWSyfskv
-=R4RR
+iQJ8BAEBCABmBQJRTX3HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MjosP/0Tih3ZzrMOAN3dwc5JXNBTD
+auojGDzqUzJT3u9VEZUt/ymPXlLKlxNXmN1tA8NT7KpwEmoWakoNaJNB6EsI2i6t
+6zlaFT5f4GxBN4AQti9BVUqHhBoDgVx7Xd9CUJ6QO5BWE7C8wzh7XIuap+pslsmm
+5OPTXtoBJ1wnrMLbnab6UjEC1X3c8MKb6Vz6qx8b7rnMBQwOGRx9deDUpLKuciOr
+uIQ9UmO3ZZ8LxL1ayjWOMBiLvDIEgOcPdns4zW2W08GQR25UwK2E7v/vDeoO7qMd
+jhEQmcwhtKqDO9RIjcAgalmYweyPHnbD6vNUW4xXZnwDSCJK+SpZjMhqhuOH7PO4
+0Grohe/jmutLbkVXzsQleDRWvIovHucdsUU7inpF5PuhjpBDo081QAgr3Wu5u8j8
+skyaKlLySddChrhBL2t3ExEvGX3i0g1hy46wPSu7nB293eVwcNVrBJtrO9VLiATQ
+0JKDzq2GFAswcSfZuYinRCFVd6ojCThSPFwob01LhjColWnnyk3pv3xh5BTUyZSd
+gsASlZM8IplG6RLSFWV6QgMR8kwtoXMgbCuqWFS5LJ0fABP9YJWAH0s+GxjRNxZz
+g6cjpq0SSsc25K64vgR7k5bYd7QimgE09gUSgoBokB78QeEfeXKRGDBQW0U/VMgS
+qdxZmr0aGPEN0lxhRqR1
+=lc+O
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmacs/files/texmacs-1.0.7.15-tm-files.patch b/app-office/texmacs/files/texmacs-1.0.7.15-tm-files.patch
deleted file mode 100644
index 5c14bb3bb836..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.7.15-tm-files.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.15-src.orig/TeXmacs/progs/texmacs/texmacs/tm-files.scm TeXmacs-1.0.7.15-src/TeXmacs/progs/texmacs/texmacs/tm-files.scm
---- TeXmacs-1.0.7.15-src.orig/TeXmacs/progs/texmacs/texmacs/tm-files.scm	2012-03-18 16:12:44.000000000 +0700
-+++ TeXmacs-1.0.7.15-src/TeXmacs/progs/texmacs/texmacs/tm-files.scm	2012-05-02 22:39:52.000000000 +0700
-@@ -206,2 +206,2 @@
-   (deprecated-function "get-name-buffer-path" "path->buffer")
--  (path->buffer name))
-+  (path->buffer p))
diff --git a/app-office/texmacs/files/texmacs-ldflags.patch b/app-office/texmacs/files/texmacs-ldflags.patch
deleted file mode 100644
index f0e632beb8b4..000000000000
--- a/app-office/texmacs/files/texmacs-ldflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/axiom/Makefile TeXmacs-1.0.7.7-src/plugins/axiom/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/axiom/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/axiom/Makefile	2010-10-31 18:26:17.000000000 +0600
-@@ -16,3 +16,3 @@
- bin/tm_axiom: src/tm_axiom.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_axiom.c -o bin/tm_axiom
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_axiom.c -o bin/tm_axiom
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/graphviz/Makefile TeXmacs-1.0.7.7-src/plugins/graphviz/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/graphviz/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/graphviz/Makefile	2010-10-31 18:29:34.000000000 +0600
-@@ -16,3 +16,3 @@
- bin/tm_graphviz: src/tm_graphviz.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/maple/Makefile TeXmacs-1.0.7.7-src/plugins/maple/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/maple/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/maple/Makefile	2010-10-31 18:30:26.000000000 +0600
-@@ -17,3 +17,3 @@
- bin/tm_maple_5: src/tm_maple_5.cpp
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/mathematica/Makefile TeXmacs-1.0.7.7-src/plugins/mathematica/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/mathematica/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/mathematica/Makefile	2010-10-31 18:31:09.000000000 +0600
-@@ -14,3 +14,3 @@
- bin/realpath: src/realpath.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/realpath.c -o bin/realpath
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/realpath.c -o bin/realpath
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/maxima/Makefile TeXmacs-1.0.7.7-src/plugins/maxima/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/maxima/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/maxima/Makefile	2010-10-31 18:32:01.000000000 +0600
-@@ -16,3 +16,3 @@
- bin/maxima_filter: src/maxima_filter.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/maxima_filter.c -o bin/maxima_filter
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/maxima_filter.c -o bin/maxima_filter
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/r/Makefile TeXmacs-1.0.7.7-src/plugins/r/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/r/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/r/Makefile	2010-10-31 18:32:47.000000000 +0600
-@@ -16,3 +16,3 @@
- bin/tm_r: src/tm_r.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/shell/Makefile TeXmacs-1.0.7.7-src/plugins/shell/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/shell/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/shell/Makefile	2010-10-31 18:34:16.000000000 +0600
-@@ -16,3 +16,3 @@
- bin/tm_shell: src/tm_shell.cpp
--	$(CXX) $(CPPFLAGS) $(CXXFLAGS)  -I../../src/System  -lutil src/tm_shell.cpp -o bin/tm_shell
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -I../../src/System -lutil src/tm_shell.cpp -o bin/tm_shell
- 
diff --git a/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild b/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
index 92c0fe27c148..20eccab9c76c 100644
--- a/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.2 2013/03/02 19:37:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild,v 1.3 2013/03/23 10:01:03 grozin Exp $
 
 EAPI=4
 
@@ -35,6 +35,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	# this file is included in the tarball erroneously
+	rm -f plugins/maxima/bin/maxima_filter
+
 	# respect LDFLAGS, bug #338459
 	epatch "${FILESDIR}"/${PN}-plugins.patch
 
diff --git a/app-office/texmacs/texmacs-1.0.7.15-r1.ebuild b/app-office/texmacs/texmacs-1.0.7.18.ebuild
index a4a3060de5d7..0230afc22132 100644
--- a/app-office/texmacs/texmacs-1.0.7.15-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.18.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2013 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.15-r1.ebuild,v 1.3 2013/03/02 19:37:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.18.ebuild,v 1.1 2013/03/23 10:01:03 grozin Exp $
 
 EAPI=4
 
-inherit autotools eutils
+inherit autotools eutils fdo-mime gnome2-utils
 
 MY_P=${P/tex/TeX}-src
 
 DESCRIPTION="Wysiwyg text processor with high-quality maths"
 HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+# Due to some changes at ftp.texmacs.org, files can no longer be fetched by wget,
+# only by wget --no-passive-ftp
+#SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~grozin/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -36,9 +39,10 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# respect LDFLAGS, bug #338459
-	epatch "${FILESDIR}"/${PN}-ldflags.patch
-	# fix a typo in tm-files.scm
-	epatch "${FILESDIR}"/${P}-tm-files.patch
+	epatch "${FILESDIR}"/${PN}-plugins.patch
+
+	# dont update mime and desktop databases and icon cache
+	epatch "${FILESDIR}"/${PN}-updates.patch
 
 	eautoreconf
 }
@@ -54,3 +58,15 @@ src_install() {
 	default
 	domenu "${FILESDIR}"/TeXmacs.desktop
 }
+
+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
+}