Fixed handling of external programs with xdg USE flag being unset (bug #449936). Removed old versions. Added myself as maintainer

Package-Manager: portage-2.2.0_alpha150/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

14 files changed, 50 insertions, 944 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index d0a8d948b6ec..ed668901520d 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.277 2013/01/07 22:22:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.278 2013/01/11 11:38:42 polynomial-c Exp $
+
+*mc-4.8.7-r1 (11 Jan 2013)
+
+  11 Jan 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -files/mc-4.8.1-fix-fallocate-xBSD.patch, -mc-4.8.3-r2.ebuild,
+  -files/mc-4.8.3-fix-chown-crash.patch,
+  -files/mc-4.8.3-fix-relative-symlink-creation-crash.patch,
+  -files/mc-4.8.3-missing-do_panel_cd_stub_env.c, -mc-4.8.4-r3.ebuild,
+  -files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch,
+  -files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch,
+  -files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch,
+  -files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch, -mc-4.8.6.ebuild,
+  +mc-4.8.7-r1.ebuild, metadata.xml:
+  Fixed handling of external programs with xdg USE flag being unset (bug
+  #449936). Removed old versions. Added myself as maintainer.
 
   07 Jan 2013; Agostino Sarubbo <ago@gentoo.org> mc-4.8.7.ebuild:
   Stable for alpha, wrt bug #436518
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 5b5fbdb7160a..a1566b146ea1 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,24 +1,31 @@
-AUX mc-4.8.1-fix-fallocate-xBSD.patch 944 SHA256 aa64c6187b18a52944837bb22c660ae56a2b11877d20a045c5cca0d875e61d05 SHA512 ac6d66e9b7cf8921e91e9c47dcec9f285a45309fcfcbe0dcbce945506e7e2bb100ac019e4966f7e0d7ab9d465aa58edb024d740afac25cbf4d656a9f76e3ed8a WHIRLPOOL 50094d150d70b9e30671886cb2d588da8d152d01cc7ae7d51f2e32a49f23de63ad82ee9c15bf946d110397cdd3c8fdb1311eec405a72154aaff8292202ef4391
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mc-4.8.1-fix-vfs-test.patch 5593 SHA256 1595a4065b3ff76a11e01b84fd3a7f552373ab00b305de32ab62ed6ebd3f7dd4 SHA512 25a6f8e9331d82bd761db5a112e180eb8a830ab1083f31c4ffb733f5827f2b84abacdbc1c4a7f55d4d0cc1053fa3a4b1ed6cc61e244bd93cf3b34fd197b601df WHIRLPOOL e7d1e49f05e4ab2ffdb4a41d4a3733091e4a535d20195f42195ff8265223c15ced4f13de55529241ceb5de22ed1dd5e97b865e4dbc9f334eb77967dd5b498a1a
 AUX mc-4.8.1-muldefs-in.patch 1963 SHA256 232f2f0bd12c666a2bee4510a5ac8d15e7cfcc197ffbea12352eda42651fc7bf SHA512 fff79974e06a5d6221ea0a0cfa92719bb02f5eefce6401a4c64816a4086408fc8bd15076ac2a2e686ae35f973fbf62834aebc8489f4269ae7ff19c77a33fd06e WHIRLPOOL 1d1dc529932ad4a296cccc5e5cbda4b264f51fb138d0c5e8492fe06473cd3eaf0692ec61cf0fc7bfbdc2806af6c2775bb65c722dec54278102ba5c9e8a04fb00
 AUX mc-4.8.1-muldefs.patch 1534 SHA256 6c08488a3047101465066c7513e384e4d4e7a211e64f9e17fe4236f4a66705de SHA512 19bedc88f0cb15442538cf349b7bbad0b708aa5365e7c4a2713a1a9a35d62f4de153595d98f4ac33195aebeec068df96f7098346c6a0234bea5bef14ec8b4143 WHIRLPOOL 1c39bd46a752317172d5901a0b0cb3eccb520717ea6fa20dc9230dc1d41991d8ef74e86a8439b0cdd9cf95afb773959b7b4cceb53d6422e322569136e864abc0
-AUX mc-4.8.3-fix-chown-crash.patch 649 SHA256 c0d73faaea8742d8c7f38d499a98ecce4043051c5336bc669e6f0dff5fe481c4 SHA512 690b15c46bbd2da8ff8cbd5000d52b3ddceea6c3a1b352862fbbcc24f4a64f3df3b2a771a3a93c7d344f0a822093d060e6561b71e98d4eb35d934fbcfb2f22bd WHIRLPOOL 35c8293028b5009747012ad9b35d88d94a4febdf86ae628bd5195c73a4778e6bf5b6cd47cdfdcd81b77059695f7de12f293743bedca01f3e67c2b9da243c1e3b
-AUX mc-4.8.3-fix-relative-symlink-creation-crash.patch 978 SHA256 76a25722091b5468066ebcb48b8b6146bc002ebd8ad3e29fffe6c4cfdf1c2e48 SHA512 ef8ab0bf84782a20c121ab938f2cb1463974f6357fa11505f3a354eeaa1cf71946c0b406e3e28f91d1df3167a20486ab20c4bcc75bdde7ba076b925195814ef1 WHIRLPOOL be83840fa0be10ccd9cc766506535e312dde5951a6468e29c22aaeb105063967cf46531913040acec9ebed9c2b14edf3f04d05d383ff57adfc12529518b988f8
-AUX mc-4.8.3-missing-do_panel_cd_stub_env.c 5456 SHA256 1ea801331225e268f9c458aa14fc654413c55e3f9b4d0f8e163ad8c40f5d10c3 SHA512 7b252f4280b20d6233feef2fa91b3b266d9a7e4ef15a68bd85b2fc808d42a040fcd9b591a92f07254a51bc451f8eb55d203ee414d2d4c11e1db589de0ffe37ec WHIRLPOOL e173a80f2cc277bc84b13370ead973dd8f57cbc6c61ee9efa8ba7e5340fec855ea1f575878373987f607c32bdc038be91c62ee6175bed488a990bc540a3f4b0c
-AUX mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch 2409 SHA256 3a1b4e333f8cdaf4264a70638396aabb64a05c220e192ec84e388c8054773aad SHA512 a1a106fc65e82cf2d4bbfb1b8da47533de39d05230a5808f0956e540ba222805f0308b77018df8f750efae63bd6f6e9d9da8d7d575bb4ae14db3e67c67745ae9 WHIRLPOOL ca1630173b22f41beec92497bed1b01b5c80808769fac835f8233107f84deff2f387df4b4e0ca584cda902c674a3df21c545ee083605194bcd41f961bb5c7061
-AUX mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch 1790 SHA256 5df43bdc2d1063204ce52a80998b05bc82037d157a9b3ecc90f48e00c8d0b433 SHA512 59ff7c5969c4a4db6268944ec8bd34f96e17cbe9d140ccd52abbf4a54ac5b276e71a529a7624492d8709dd48805fe453646c5515fb31d0dd791ccd4fd8195092 WHIRLPOOL e7f694a2b260fdc8f05cd55fde2e363ad610467a3fc1020a30a455d230781ea32e0dd9e8466b9164408fcc5ba336f161df0e8ebe0025af6029a15b0ed68194eb
-AUX mc-4.8.4-Ticket-2856-aspell-sigsegv.patch 2867 SHA256 44cebc6d38ffb38c4c7108295bc3d7f49c8ef268d9d8028a3181fd76ab01a3d0 SHA512 df0d6c439004900ddb73079fb11e6e400bd5b317794f6bc5ffdc7f8216d89cf59dce1a76a248561dd1bb04034343d50c9b0376565c83aae2234ee456506cf755 WHIRLPOOL e39f1acb3d0b99e663a86a8b5e7dc35db96b66efeeac7b7ca12d22ee83037dd33cfd6545b6a8713b7f9251120801f40bf161e0a282a84af19f7d52d41b478b21
-AUX mc-4.8.4-Ticket-2858-htmlview-segfault.patch 1079 SHA256 ba7cce62af883504b82fc0489ea290b5a325d89d97a5c15d66f587ddefaf8ace SHA512 9f0bfb62d1783a2e3379245d43dfd22f82928fb188c79a0fbf1bd19c0a553b13b120b6c925db1cf70d3050148877a2ddd1d4540446b15a0b7e7c2134d752ab1d WHIRLPOOL c75dec958f43d7c6c5ebd9f08258bf7698f2afdd9af18e95b54aad8576dd1cfdfb8b803d6363ffe1345d3dd8d49f6533c0908fff4b6ec9602ac780ed80347c2e
 DIST mc-4.8.1.tar.xz 2057960 SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672 SHA512 39158429c78e959700411e4b3c714552cad4e8badedcf9c391e4807f27f35753dcf911427b4319ea22be03c7cf7b1a3ff494e6c1b8f90389e5d518f1bb9cfa1c WHIRLPOOL e34e6dad86fbc4a4d2f727094ddfbbc7a346161b04944f6ec65bc2c27770ece5c3c8f9d46aef021a007dc3b8b4eceb2b34b9c6d6e266a9c431969043d838f7d3
-DIST mc-4.8.3.tar.xz 2042276 SHA256 bd2855116f6dc9acf5b45d2794beeba3ddfb2e71cd9ac3b692dd6629019e42a3 SHA512 db52c53b7325974fb8f5b6077ea6e802b05f2993492d486607745d0dde1dc77a305865c86c0afcd3b39b9f0abbc8ad50a45e279a4072a1481b7969aaf2032843 WHIRLPOOL 9263d9dfd35b12ea379c8ea0f0e966ccc2ad86bf292324615735db92a324487dea2c27666a8be350971991cbdbccf402549b6a904bdd2f35a208d90a1d387556
-DIST mc-4.8.4.tar.xz 2114996 SHA256 b4be11c27857ec0c0896a7cd42dd1782a03d1e4c82c83f86b5cc880f6970863e SHA512 b0827f5a88dd65a12a15dc207ab2e97d5ed40c38921ad17c22a8316a62122238bb69077100744cc2fea20b6a202812bc8e38183546fe3ef63924017269a024c7 WHIRLPOOL 65aaf0a95911eade82a00513e71ca00d13c914412f9de33269e4b216df4e64025e42a20808cc265ef5fac3388a0ec832f3a3c64aadba82f1a725b9a92d070eb0
-DIST mc-4.8.6.tar.xz 2172316 SHA256 b39456f384123aba46124b93220f99e1b1c705112be55fc92275830132f28083 SHA512 6df489127f90c60e2041c5bac9a05f447c8de0ef7ec569b335b87da6fb308b809b2d9a693c076ba215d4b67c534f0b332426e3172ae71f634edfc0953143e974 WHIRLPOOL 20f130ec2b5ca95671914c53c83079c3d2026139f163bd32efa717c72854d34aaa05bab85639cde0a077f792d000ddc803bf3f8444f5740fa0b60a17d30a2777
 DIST mc-4.8.7.tar.xz 2106020 SHA256 88f620f7944d629087e0f3518a7e7bff7600fd1c4fa157767cdcca95f2cb3074 SHA512 f5c0f533e4e056246d5918233b9932f751589db613f1c591be3168b607a9b73919e93b631151c1c4dbc692b54e7ec1b2f8ec2ae875a24012744e7257735fa1d8 WHIRLPOOL 768b08f2ff0ce1de8893aec2a083269ecde6c62e6e7ea5379a96eec81ad56791e4adbfe712014cece323857fb96862a29dc97893b53f8d5316707e933f015342
 EBUILD mc-4.8.1-r1.ebuild 2434 SHA256 6a522cc7848b82af67a0782b2aba63f4826f6a676f53cbf9c0e140ad64761faa SHA512 809c3b90c3b46208472b8257e0ae6dbd057cb42908f0e35cae6374f1d147755c37967947e7b167c42ead342cd12ac47ff2ba5c4f4dd16a2b75e7cad1fa6e391e WHIRLPOOL 3747c38ffe32e2cddea165f219b367d3154470d0e6b2bcd529cf450641c1283b51cb015b40f745a195e2461b7b8da022e91130e3da4b7842f68b77cb8b94f680
-EBUILD mc-4.8.3-r2.ebuild 2381 SHA256 8c7a9774706f49d88e2ce3ebce373a03018a40b1ec2f2334e74c511f583b719e SHA512 ef0d842fbaaf65dcf9e21cff5cc919d747682f1aa7e0915732aa32f989fe94ada75eb0b336dc2a6508400c7456efdf960042b3051272ad2574196bb92791daec WHIRLPOOL 42754d1bb6a24efb12b34bc76fee5375a47e9a1fd95eafbb32fca886e89b12bd02e3e799061f391e2df8631b2eb4f3e9d8e22da0eb3488f4f0464935bf8563d5
-EBUILD mc-4.8.4-r3.ebuild 2822 SHA256 e60f673ca98a62c571573c8f9ccd9d8871dec5dfc261419fa770422475c89d3e SHA512 c2f8ee7a3dc41c67223d82c069d69dc56a79ec4c3617180edfeb0025509281aa427bb220609e317c920435d7f704bf6c26db2c3d5a48ac359a02665f9394b88b WHIRLPOOL b78abe634ac6dac72b36321ba2baf198755632e3ac6abcdbc0a984670563533d1ac5d45e2c308ee9a1ef14de59d48ec228cb91a717a577b59acb95fcc597c184
-EBUILD mc-4.8.6.ebuild 2441 SHA256 c9e9dbed4410aeb4ddb5d156c9a2e41d87d54536a5062b1e01217de2cf85029f SHA512 60748eda9112c67a8c3c12135c4b4dedc5e297070a0f239ae74ccbb3382f411e0f511e378c60928d70a55a5dce73924566b27a4f172109c8807ee29ae1772748 WHIRLPOOL 2f9798f1bdb99124a642df397f86f1d9a3e53a01b9cd3cb1fcd4da47b780d8d3fe6954190613cdab204db8ff6c963ee6fbe1a6a74bdfc3a0110a75f16eee9389
+EBUILD mc-4.8.7-r1.ebuild 2584 SHA256 9580d8c4cdc3e049a6944413883408f179c91b2ebe632961b289c756aeff71b3 SHA512 428780c34773ff31d303e778e5217b6fe3fa1d021e744e739eee498abdf8ea9af699d38a8c0b4b249ee296eab34b338d781b8f1268591b653a2e6ff46eaba90a WHIRLPOOL e8705544a5563cdb00c829251abb22da4a18ab6d3016a0b33d74453a7eb5b57928b69b1f9ce59cdc02448c1c66ddf9fd66d1cadc4a0589b9542e40b37b38ab30
 EBUILD mc-4.8.7.ebuild 2430 SHA256 2a73e992c30f517a4e50e575e8641998e56e1772f3b18414d5ef7e2eb004dd9a SHA512 a7b977ef845966db6137b03d8a10bd9aa01254c199ca31b0d17c8a431d710453b6e40f6930d4ee72ffad39414b3d615158b0ee63742d39b2d39e59b5ea984cf0 WHIRLPOOL 6b56e44def2a343bbc88616e0fdc954c38503b3e9196e714ab45db5ab67b17e8db2839f644b64c0c2100720759ec2f2f1b58c1aa7d93a96a34441e2d8361c5ed
 EBUILD mc-9999.ebuild 2721 SHA256 fe32560f1575e9923c99c4cfebb1741d168a30810a567700550ecce13aa1c15f SHA512 f77cc4246162f0507338299fba490fc0c21ae532409def6010a2952b5b6a4f817ce814942583c6feb2b38cceadad0b2c6e2655142cff22791e3077302e5b1bb0 WHIRLPOOL 013de6eb8943c42d6cf4e15c7ad8deb31c3b034dc5e65c25590efc5de6924d9d3a2dcbe7d5b5a0a6d36854e0af1f3a17ad56125fd29e72e003e9af18f27be17e
-MISC ChangeLog 41312 SHA256 6c215ffaebcf5763a8a3668b17315bedd2d9f63de4d3ec8b05b11b3260a747b0 SHA512 08d9926cb07b22842fe036ee3a0e7a5b5f07c26cf146e7c79fd2af6c37ee47db4fff0e4087fc2cfd4d6375569d47a628e98d1e234a69e519e8548613a9f0e994 WHIRLPOOL 94aa73c2d0c5612e2654ed572a13558899bad623d2cdc140d2e32295d3c70a14bac9bea2cc7348ca98c5be4c13286f1856c29f9fc19034d60eeb63c80309646a
-MISC metadata.xml 846 SHA256 2ce5d9e8575133f3b3ef99fabbb133b0eeccf26ff346970dd034b16dd7b05fe9 SHA512 522568197614833eea1a6322b8b96f5f70f3c27d0aed734b7271d46f27852a97d6e20fa1bc3fa028c2fccb97d4b87d177f87dea1ac3d5f7d5d5330c84a39e68c WHIRLPOOL c6cee8edfb33b4160c143769f9581b90198eab76a5d324eb65795b4513609f49cd50661f4680a705be8458ef883eab5e8d491e7008c352a6359378eeff30850d
+MISC ChangeLog 42059 SHA256 f94649f25041f341858335d45d08f23b16c7e94a67c107b60819e13cff6f71b7 SHA512 45eacdf0d60ff168eef0c22f35b6accc1224ed71b7f526566040a484f84277974139f92b22a6e269bdcf387073ff8151650bd445672118febd158e47bfc06ca6 WHIRLPOOL 62d205096f287b76c1ba954f59c43a36168b7da952e51e57473e36acadac3f064ae4c16d043574ffc8ad0db2e4d2d76df43005eb0a5d79cd792c627560e4ea80
+MISC metadata.xml 950 SHA256 7a5f3db095ee82a58da8299170da072eb298919ae2beec7020e2ca12982b3263 SHA512 9143eda1ccedb0613eb915f30e70259c32b5075669e256c43c488c1baf34ffecb3210583144bf0389af463fdbc98f60f5d781b6afa77f1951cba11b16555132b WHIRLPOOL cbcc220f6ba1de379b0225d0079945991362aadf88df2aac225994841ec7c81f5132ef3a0b506433d46abe445673dc7dc406fce37dc5e04a17179c6858a3bdea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ7/nDAAoJEPiazRVxLXTF0w4P/i5qwzxvvHCj0be5r5J+Jv+m
+jfAKvCOL0ci2QuCSxs4dz+7F2TPoQYwe0wo+Nln/1SM+3DGnIHoJgb5JSusJ78xs
+89j9ng59NNNheJwJIqIeRMtKBud9wr3wDJyD43JYhhiOf3NQE6YjEuIxMDeESJCN
+DL9SzTcPM2yJSXqnvqEull2oTRL4IjpSJN4dGTgMNgioOidSNbRViFrorSw6z2U7
+8YYmJO5GO/4o/nvs2fNVuKRazY0SiNU3RUhWYI5hJ1nQHL7GzRPY9rXTG6DxI0tv
+28riObu/lLLPtiQLFwYYPJRGL8FYfENEAE1ltl9GBTxjhX3OVVBl2vXspEQf9l2W
+LzBqfC4SkiSa0uBgCcQKgLQovLcfztuSRSXQuk7bCBa4tVDdjssLFprrkArSqTzz
+YhY5p4AdukRNjFQrLK848knXKoexrbVZQVCIliShNY/hepx7Ptfp/Ag35ROb9eTf
+GuPjPt+zYv4FHWQGcpTmQi+HMzMxPTBkJXcYGNx0Zdxq5/0QIuzE753BfEp5hfmh
+vjU1zcE9WFkBuhFvp5+EaGJtRWUi4O0xCQpcrXfaDFO2TGLozGDe1MbXKMrI3WVK
+NOVwWUzULR8/8v9rddwIn572B2hD9/hJg0IRLr038dbx+8RNE/kyboejlnS5OM5P
+vKtAc//0SYsxFknSnZtg
+=6DtM
+-----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch b/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
deleted file mode 100644
index 85ce611945b3..000000000000
--- a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a6ca3c289994a3a9ab8f481582e2632109b759f0 Mon Sep 17 00:00:00 2001
-From: Egmont Koblinger <egmont@gmail.com>
-Date: Thu, 19 Jan 2012 14:11:10 +0400
-Subject: [PATCH] Ticket #2689 (fix fallocate detection for xBSD)
-
-    fixed macros 'mc-get-fs-info.m4' for correct 'fallocate' detection under xBSD
-
-Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
----
- m4.include/mc-get-fs-info.m4 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/m4.include/mc-get-fs-info.m4 b/m4.include/mc-get-fs-info.m4
-index bc0ca54..b1474d8 100644
---- a/m4.include/mc-get-fs-info.m4
-+++ b/m4.include/mc-get-fs-info.m4
-@@ -5,7 +5,7 @@ dnl
- 
- AC_DEFUN([gl_POSIX_FALLOCATE], [
-     dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
--    AC_TRY_COMPILE([
-+    AC_TRY_LINK([
-         #define _XOPEN_SOURCE 600
-         #include <stdlib.h>
-         #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
--- 
-1.7.8.3
-
diff --git a/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch b/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch
deleted file mode 100644
index 8ea232d15593..000000000000
--- a/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://www.midnight-commander.org/ticket/2784
-https://www.midnight-commander.org/changeset/ac880c71a74c1fc75d7162b2ca3613970479e663
-
---- mc-4.8.3/src/filemanager/chown.c
-+++ mc-4.8.3/src/filemanager/chown.c
-@@ -378,7 +378,7 @@
-                     if (mc_chown (fname_vpath, new_user, new_group) == -1)
-                         message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"),
-                                  fname, unix_error_string (errno));
--                    vfs_path_free (vpath);
-+                    vfs_path_free (fname_vpath);
-                 }
-                 else
-                     apply_chowns (new_user, new_group);
diff --git a/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch b/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch
deleted file mode 100644
index cd2cda67f81c..000000000000
--- a/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/413691
-
-commit 038b5e7406d177792d3e2cd904f6d32e5f392903
-Author: Andrew Borodin <aborodin@vmail.ru>
-Date:   Tue Apr 24 20:41:37 2012 +0400
-
-    Ticket #2787: crash when creating relative symlink.
-    
-    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
-diff --git a/lib/util.c b/lib/util.c
-index 2c6011b..490bdfc 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -112,14 +112,14 @@ is_8bit_printable (unsigned char c)
- static char *
- resolve_symlinks (const vfs_path_t *vpath)
- {
--    char *p;
-+    char *p, *p2;
-     char *buf, *buf2, *q, *r, c;
-     struct stat mybuf;
- 
-     if (vpath->relative)
-         return NULL;
- 
--    p = vfs_path_to_str (vpath);
-+    p = p2 = vfs_path_to_str (vpath);
-     r = buf = g_malloc (MC_MAXPATHLEN);
-     buf2 = g_malloc (MC_MAXPATHLEN);
-     *r++ = PATH_SEP;
-@@ -181,7 +181,7 @@ resolve_symlinks (const vfs_path_t *vpath)
- 
-   ret:
-     g_free (buf2);
--    g_free (p);
-+    g_free (p2);
-     return buf;
- }
- 
diff --git a/app-misc/mc/files/mc-4.8.3-missing-do_panel_cd_stub_env.c b/app-misc/mc/files/mc-4.8.3-missing-do_panel_cd_stub_env.c
deleted file mode 100644
index 5591880f919e..000000000000
--- a/app-misc/mc/files/mc-4.8.3-missing-do_panel_cd_stub_env.c
+++ /dev/null
@@ -1,397 +0,0 @@
-#include "src/subshell.h"
-#include "src/setup.h"
-
-
-panels_options_t panels_options;
-struct mc_fhl_struct *mc_filehighlight;
-int confirm_execute = 0;
-int auto_save_setup = 0;
-int free_space = 0;
-int horizontal_split = 0;
-int first_panel_size = 0;
-int default_source_codepage = 0;
-int menubar_visible = 1;
-WPanel *current_panel;
-WInput *cmdline;
-WMenuBar *the_menubar;
-const global_keymap_t *panel_map;
-gboolean command_prompt;
-int saving_setup;
-
-panels_layout_t panels_layout = {
-    .horizontal_split = 0,
-    .vertical_equal = 1,
-    .left_panel_size = 0,
-    .horizontal_equal = 1,
-    .top_panel_size = 0
-};
-
-WInput *
-command_new (int y, int x, int cols)
-{
-    WInput *cmd;
-    const input_colors_t command_colors = {
-        DEFAULT_COLOR,
-        COMMAND_MARK_COLOR,
-        DEFAULT_COLOR,
-        COMMAND_HISTORY_COLOR
-    };
-
-    cmd = input_new (y, x, (int *) command_colors, cols, "", "cmdline",
-                     INPUT_COMPLETE_DEFAULT | INPUT_COMPLETE_CD | INPUT_COMPLETE_COMMANDS |
-                     INPUT_COMPLETE_SHELL_ESC);
-
-    /* Add our hooks */
-    cmd->widget.callback = NULL;
-
-    return cmd;
-}
-
-int
-do_cd (const vfs_path_t *new_dir, enum cd_enum exact)
-{
-    (void) new_dir;
-    (void) exact;
-
-    return 0;
-}
-
-void
-do_subshell_chdir (const vfs_path_t * vpath, gboolean update_prompt, gboolean reset_prompt)
-{
-    (void) vpath;
-    (void) update_prompt;
-    (void) reset_prompt;
-}
-
-void
-shell_execute (const char *command, int flags)
-{
-    (void) command;
-    (void) flags;
-}
-
-void
-panel_load_setup (WPanel * panel, const char *section)
-{
-    (void) panel;
-    (void) section;
-}
-
-void
-panel_save_setup (WPanel * panel, const char *section)
-{
-    (void) panel;
-    (void) section;
-}
-
-void
-free_my_statfs (void)
-{
-
-}
-
-int
-select_charset (int center_y, int center_x, int current_charset, gboolean seldisplay)
-{
-    (void) center_y;
-    (void) center_x;
-    (void) current_charset;
-    (void) seldisplay;
-
-    return 0;
-}
-
-void
-update_xterm_title_path (void)
-{
-}
-
-void
-init_my_statfs (void)
-{
-}
-void
-my_statfs (struct my_statfs *myfs_stats, const char *path)
-{
-    (void) myfs_stats;
-    (void) path;
-}
-
-void
-clean_dir (dir_list * list, int count)
-{
-    (void) list;
-    (void) count;
-
-}
-
-struct Widget *
-get_panel_widget (int idx)
-{
-    (void) idx;
-
-    return NULL;
-}
-
-
-int
-do_load_dir (const vfs_path_t *vpath, dir_list * list, sortfn * sort, gboolean reverse,
-                 gboolean case_sensitive, gboolean exec_ff, const char *fltr)
-{
-    (void) vpath;
-    (void) list;
-    (void) sort;
-    (void) reverse;
-    (void) case_sensitive;
-    (void) exec_ff;
-    (void) fltr;
-
-    return 0;
-}
-
-int
-do_reload_dir (const vfs_path_t * vpath, dir_list * list, sortfn * sort, int count,
-                   gboolean reverse, gboolean case_sensitive, gboolean exec_ff, const char *fltr)
-{
-    (void) vpath;
-    (void) list;
-    (void) sort;
-    (void) count;
-    (void) reverse;
-    (void) case_sensitive;
-    (void) exec_ff;
-    (void) fltr;
-
-    return 0;
-
-}
-
-void
-do_sort (dir_list * list, sortfn * sort, int top, gboolean reverse,
-              gboolean case_sensitive, gboolean exec_ff)
-{
-    (void) list;
-    (void) sort;
-    (void) top;
-    (void) reverse;
-    (void) case_sensitive;
-    (void) exec_ff;
-}
-
-int
-regex_command (const vfs_path_t *filename, const char *action, int *move_dir)
-{
-    (void) filename;
-    (void) action;
-    (void) move_dir;
-
-    return 0;
-}
-
-gboolean
-if_link_is_exe (const vfs_path_t *full_name, const file_entry * file)
-{
-    (void) full_name;
-    (void) file;
-
-    return TRUE;
-}
-
-void
-change_panel (void)
-{
-}
-
-gboolean
-set_zero_dir (dir_list * list)
-{
-    (void) list;
-
-    return TRUE;
-}
-
-void
-load_hint (gboolean force)
-{
-    (void) force;
-}
-
-panel_view_mode_t
-get_display_type (int idx)
-{
-    (void) idx;
-    return view_listing;
-}
-
-panel_view_mode_t
-get_current_type (void)
-{
-    return view_listing;
-}
-
-panel_view_mode_t
-get_other_type (void)
-{
-    return view_listing;
-}
-
-int
-get_current_index (void)
-{
-    return 0;
-}
-
-int
-get_other_index (void)
-{
-    return 1;
-}
-
-int
-unsorted (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_name (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_vers (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_ext (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_time (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_atime (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_ctime (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_size (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_inode (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-void
-set_display_type (int num, panel_view_mode_t type)
-{
-    (void) num;
-    (void) type;
-}
-
-void
-copy_cmd_local (void)
-{
-}
-
-void
-delete_cmd_local (void)
-{
-}
-
-void
-view_raw_cmd (void)
-{
-}
-
-void
-edit_cmd_new (void)
-{
-}
-
-void
-rename_cmd_local (void)
-{
-}
-
-void
-select_invert_cmd (void)
-{
-}
-
-void
-unselect_cmd (void)
-{
-}
-
-void
-select_cmd (void)
-{
-}
-
-struct WPanel *
-get_other_panel (void)
-{
-    return NULL;
-}
-
-const panel_field_t *
-sort_box (panel_sort_info_t * info)
-{
-    (void) info;
-
-    return NULL;
-}
-
-void
-midnight_set_buttonbar (WButtonBar * b)
-{
-    (void) b;
-}
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch
deleted file mode 100644
index a200f56b83d5..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d099c36a98110f201195392a8de0aaf289110107 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 21 Jul 2012 15:21:54 +0400
-Subject: [PATCH] Ticket #2851: fixes of ext.d scripts:
-
-  * cleanup of undefined variables;
-  * use proper variables instead of udefine ones.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- misc/ext.d/misc.sh.in |    1 -
- misc/ext.d/package.sh |    3 +--
- misc/ext.d/text.sh.in |    9 ++++-----
- 3 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/misc/ext.d/misc.sh.in b/misc/ext.d/misc.sh.in
-index 53b4821..ea80ced 100644
---- a/misc/ext.d/misc.sh.in
-+++ b/misc/ext.d/misc.sh.in
-@@ -8,7 +8,6 @@ filetype=$2
- 
- do_view_action() {
-     filetype=$1
--    filename=$2
- 
-     case "${filetype}" in
-     iso9660)
-diff --git a/misc/ext.d/package.sh b/misc/ext.d/package.sh
-index 0369d9b..0a28cb7 100644
---- a/misc/ext.d/package.sh
-+++ b/misc/ext.d/package.sh
-@@ -9,7 +9,6 @@ filetype=$2
- 
- do_view_action() {
-     filetype=$1
--    filename=$2
- 
-     case "${filetype}" in
-     trpm)
-@@ -24,7 +23,7 @@ do_view_action() {
-         $RPM -qivlp --scripts "${MC_EXT_FILENAME}"
-         ;;
-     deb)
--        dpkg-deb -I "${filename}" && echo && dpkg-deb -c "${MC_EXT_FILENAME}"
-+        dpkg-deb -I "${MC_EXT_FILENAME}" && echo && dpkg-deb -c "${MC_EXT_FILENAME}"
-         ;;
-     debd)
-         dpkg -s `echo "${MC_EXT_BASENAME}" | sed 's/\([0-9a-z.-]*\).*/\1/'`
-diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in
-index 176cf09..5efd04b 100644
---- a/misc/ext.d/text.sh.in
-+++ b/misc/ext.d/text.sh.in
-@@ -33,7 +33,6 @@ get_unpacker() {
- 
- do_view_action() {
-     filetype=$1
--    pager=$2
- 
-     unpacker=`get_unpacker ${filetype}`
- 
-@@ -60,11 +59,11 @@ do_view_action() {
-     man.gz|man.bz|man.bz2|man.lzma|man.xz)
-         case "${MC_EXT_CURRENTDIR}"/"${MC_EXT_FILENAME}" in
-         */log/*|*/logs/*)
--            ${unpacker} %f
-+            ${unpacker} "${MC_EXT_FILENAME}"
-             ;;
-         *)
--             ${unpacker} ${filename} | nroff @MAN_FLAGS@ @MANDOC@
--             ;;
-+            ${unpacker} "${MC_EXT_FILENAME}" | nroff @MAN_FLAGS@ @MANDOC@
-+            ;;
-         esac
-         ;;
-     *)
-@@ -122,7 +121,7 @@ do_open_action() {
- 
- case "${action}" in
- view)
--    do_view_action "${filetype}" "${pager}"
-+    do_view_action "${filetype}"
-     ;;
- open)
-     xdg-open "${MC_EXT_FILENAME}" 2>/dev/null || \
--- 
-1.7.8.6
-
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
deleted file mode 100644
index a67352d2a6c1..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://www.midnight-commander.org/ticket/2853
-https://www.midnight-commander.org/changeset/972beef6ea2392ab30d755e3421b3dd0b4e2a3df
-
-Index: src/args.c
-===================================================================
---- src/args.c	(revision 23c95d36ac4465627fbc9183e083a8320df77fcf)
-+++ src/args.c	(revision 972beef6ea2392ab30d755e3421b3dd0b4e2a3df)
-@@ -546,5 +546,5 @@
-             else
-             {
--                arg = mcedit_arg_vpath_new (tmp_vpath, 1);
-+                arg = mcedit_arg_vpath_new (tmp_vpath, 0);
-                 vfs_path_free (fname_vpath);
-             }
-@@ -553,5 +553,5 @@
-         }
-         else
--            arg = mcedit_arg_new (tmp, 1);
-+            arg = mcedit_arg_new (tmp, 0);
- 
-         flist = g_list_prepend (flist, arg);
-@@ -559,12 +559,9 @@
- 
-     if (flist == NULL)
--        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 1));
-+        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0));
-     else if (first_line_number != -1)
-     {
-         /* overwrite line number for first file */
-         GList *l;
--
--        if (first_line_number == 0)
--            first_line_number = 1;
- 
-         l = g_list_last (flist);
-@@ -820,5 +817,5 @@
-  *
-  * @param file_name   file name
-- * @param line_number line number
-+ * @param line_number line number. If value is 0, try to restore saved position.
-  * @return mcedit_arg_t object
-  */
-@@ -835,5 +832,5 @@
-  *
-  * @param file_vpath  file path object
-- * @param line_number line number
-+ * @param line_number line number. If value is 0, try to restore saved position.
-  * @return mcedit_arg_t object
-  */
-@@ -846,6 +843,4 @@
-     arg = g_new (mcedit_arg_t, 1);
-     arg->file_vpath = file_vpath;
--    if (line_number == 0)
--        line_number = 1;
-     arg->line_number = line_number;
- 
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch
deleted file mode 100644
index b27088e53775..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Reported-by: Lars Wendler (Polynomial-C)
-Gentoo-bug: https://bugs.gentoo.org/429794
-Upstream bug: https://www.midnight-commander.org/ticket/2856
-
-From 105ac777e17859cad4f3e9cf44663a3f98cfe829 Mon Sep 17 00:00:00 2001
-From: Slava Zanko <slavazanko@gmail.com>
-Date: Wed, 25 Jul 2012 16:30:00 +0300
-Subject: [PATCH] Ticket #2856: Fixed mceditor 4.8.4 segfaults when aspell
- dictionaries aren't installed
-
-Steps to reproduce:
- * compile mc with aspell support
- * remove all aspell's dictionaries
- * run mc and try to open any file in the internal editor
- * close the error dialog
- * try to exit from editor
-
-Expected behaviour: a file panels should be shown
-Actual behaviour: the segfault here.
-
-Signed-off-by: Slava Zanko <slavazanko@gmail.com>
----
- src/editor/spell.c |   15 +++++++++------
- 1 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/editor/spell.c b/src/editor/spell.c
-index 73aa9d5..5b4ac6f 100644
---- a/src/editor/spell.c
-+++ b/src/editor/spell.c
-@@ -71,9 +71,7 @@ static struct AspellStringEnumeration *(*mc_aspell_word_list_elements) (const st
-                                                                         * ths);
- static const char *(*mc_aspell_config_retrieve) (struct AspellConfig * ths, const char *key);
- static void (*mc_delete_aspell_speller) (struct AspellSpeller * ths);
--/*
--   static void (*mc_delete_aspell_config) (struct AspellConfig * ths);
-- */
-+static void (*mc_delete_aspell_config) (struct AspellConfig * ths);
- static void (*mc_delete_aspell_can_have_error) (struct AspellCanHaveError * ths);
- static const char *(*mc_aspell_error_message) (const struct AspellCanHaveError * ths);
- static void (*mc_delete_aspell_string_enumeration) (struct AspellStringEnumeration * ths);
-@@ -228,7 +226,7 @@ spell_available (void)
-         (spell_module, "delete_aspell_speller", (void *) &mc_delete_aspell_speller))
-         goto error_ret;
- 
--    if (!g_module_symbol (spell_module, "delete_aspell_config", (void *) &mc_delete_aspell_speller))
-+    if (!g_module_symbol (spell_module, "delete_aspell_config", (void *) &mc_delete_aspell_config))
-         goto error_ret;
- 
-     if (!g_module_symbol (spell_module, "delete_aspell_string_enumeration",
-@@ -311,7 +309,7 @@ aspell_init (void)
-     {
-         edit_error_dialog (_("Error"), mc_aspell_error_message (error));
-         mc_delete_aspell_can_have_error (error);
--        g_free (global_speller);
-+        aspell_clean ();
-     }
- }
- 
-@@ -326,7 +324,12 @@ aspell_clean (void)
-     if (global_speller == NULL)
-         return;
- 
--    mc_delete_aspell_speller (global_speller->speller);
-+    if (global_speller->speller != NULL)
-+        mc_delete_aspell_speller (global_speller->speller);
-+
-+    if (global_speller->config != NULL)
-+        mc_delete_aspell_config (global_speller->config);
-+
-     g_free (global_speller);
-     global_speller = NULL;
- 
--- 
-1.7.8.6
-
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
deleted file mode 100644
index 748f39c6b13f..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://www.midnight-commander.org/ticket/2858
-https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f
-
-Index: src/filemanager/usermenu.c
-===================================================================
---- src/filemanager/usermenu.c	(revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f)
-+++ src/filemanager/usermenu.c	(revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f)
-@@ -749,6 +749,7 @@
-         return g_strdup ("%");
- 
--    if (mc_global.mc_run_mode == MC_RUN_FULL)
--    {
-+    switch (mc_global.mc_run_mode)
-+    {
-+    case MC_RUN_FULL:
-         if (g_ascii_islower ((gchar) c))
-             panel = current_panel;
-@@ -760,9 +761,16 @@
-         }
-         fname = g_strdup (panel->dir.list[panel->selected].fname);
--    }
-+        break;
-+
- #ifdef USE_INTERNAL_EDIT
--    else if (mc_global.mc_run_mode == MC_RUN_EDITOR)
-+    case MC_RUN_EDITOR:
-         fname = edit_get_file_name (edit_widget);
-+        break;
- #endif
-+
-+    default:
-+        /* other modes don't use formats */
-+        return g_strdup ("");
-+    }
- 
-     if (do_quote)
diff --git a/app-misc/mc/mc-4.8.3-r2.ebuild b/app-misc/mc/mc-4.8.3-r2.ebuild
deleted file mode 100644
index bb55a99138ea..000000000000
--- a/app-misc/mc/mc-4.8.3-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.3-r2.ebuild,v 1.4 2012/08/04 15:14:09 hasufell Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba +slang test X +xdg"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	cp "${FILESDIR}"/${P}-missing-do_panel_cd_stub_env.c \
-		tests/src/filemanager/do_panel_cd_stub_env.c || die
-
-	# bug #413259
-	epatch "${FILESDIR}"/${P}-fix-chown-crash.patch
-	epatch "${FILESDIR}"/${P}-fix-relative-symlink-creation-crash.patch #413691
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.4-r3.ebuild b/app-misc/mc/mc-4.8.4-r3.ebuild
deleted file mode 100644
index e83bfa1b2088..000000000000
--- a/app-misc/mc/mc-4.8.4-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.4-r3.ebuild,v 1.1 2012/08/05 17:43:29 slyfox Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-LANGS="az be bg ca cs da de el eo es et eu fi
-fr gl hu ia id it ja ka ko lt lv mn nb nl pl pt_BR
-pt ro ru sk sl sr sv sv_SE ta tr uk vi wa zh_CN zh_TW"
-#LANGS+=" de_CH fi_FI it_IT" # suspicious overlap
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare() {
-	strip-linguas ${LANGS}
-
-	epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch \
-		"${FILESDIR}"/${P}-Ticket-2853-fileposition-in-mcedit.patch \
-		"${FILESDIR}"/${P}-Ticket-2858-htmlview-segfault.patch \
-		"${FILESDIR}"/${P}-Ticket-2856-aspell-sigsegv.patch
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.6.ebuild b/app-misc/mc/mc-4.8.7-r1.ebuild
index 37a454268b92..902b63f36f2d 100644
--- a/app-misc/mc/mc-4.8.6.ebuild
+++ b/app-misc/mc/mc-4.8.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.6.ebuild,v 1.1 2012/09/15 07:33:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.7-r1.ebuild,v 1.1 2013/01/11 11:38:42 polynomial-c Exp $
 
 EAPI=4
 
@@ -83,6 +83,11 @@ src_install() {
 		fowners root:tty /usr/libexec/mc/cons.saver
 		fperms g+s /usr/libexec/mc/cons.saver
 	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index c4885491b844..2045d54a3048 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -10,6 +10,10 @@
     <email>slyfox@gentoo.org</email>
     <name>Sergei Trofimovich</name>
   </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
     <flag name="mclib">Compile and install the libmc.so shared library</flag>