Added USE=spell to use aspell checker from live ebuild. Fix to view /var/log/*.1.gz files (https://www.midnight-commander.org/ticket/2852). Cleanup old unstable versions.

Package-Manager: portage-2.2.0_alpha118_p1/cvs/Linux x86_64

15 files changed, 116 insertions, 1036 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 2347ffb569eb..0d439265012a 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.260 2012/07/21 11:25:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.261 2012/07/21 15:59:49 slyfox Exp $
+
+*mc-4.8.4-r1 (21 Jul 2012)
+
+  21 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch, +mc-4.8.4-r1.ebuild,
+  -files/mc-4.8.0-fix-ftp-spaces.patch, -files/mc-4.8.0-fix-nls.patch,
+  -files/mc-4.8.2-fix-existing.patch,
+  -files/mc-4.8.2-mcedit-without-file-param-fix.patch,
+  -files/mc-4.8.2-missing-do_panel_cd_stub_env.c, -mc-4.7.0.10.ebuild,
+  -mc-4.7.0.3.ebuild, -mc-4.7.5.2.ebuild, -mc-4.7.5.6-r1.ebuild,
+  -mc-4.8.1-r2.ebuild, -mc-4.8.2-r2.ebuild, -mc-4.8.4.ebuild:
+  Added USE=spell to use aspell checker from live ebuild. Fix to view
+  /var/log/*.1.gz files (https://www.midnight-commander.org/ticket/2852).
+  Cleanup old unstable versions.
 
   21 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> mc-9999.ebuild:
   Add USE=spell (uses app-text/aspell as a spell checker).
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 8cbbecc8d039..920ddf634184 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,42 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mc-4.8.0-fix-ftp-spaces.patch 1047 SHA256 4285ba9907b4460739802876e39c8e2df858264214ef81ed8c2291b22f039515 SHA512 4aa6a5da6224008db962e29dd99a7e89aad68e7179ef829555d75a5dfdcf4d1b45dc6e8dfddeced4f49fd18ffab67aad5af2085188ec54ef49118a9b78aebdc0 WHIRLPOOL 3f6447aad4069920a17f05c7650429757654a80ec5bb796c524bfbd03c8c498966dede09a9693ecd7683c72583caccf94217f6172838cea18ce3145b65718421
-AUX mc-4.8.0-fix-nls.patch 949 SHA256 504856248f6c3ab21870c7555f31cdcd9ac509c883ab6cc2929440fb9d1e2216 SHA512 a6ec922999fea5a208d9998cebf968295b14b34c6c88f9d8c9eb2672aea9daff8c81dcf2ef04f06911e8df0ca059e558bdf2755c552f7fe7cd6c17e0ebf465b0 WHIRLPOOL 3c731f46aef7dd5ab68e22287c992ef4dfd1878a9dba0e419a9b80eaf8711441dfb86d368b7761a9c3495326a3eed843abd36fa26680db92968d6a813ee9b9f3
 AUX mc-4.8.1-fix-fallocate-xBSD.patch 944 SHA256 aa64c6187b18a52944837bb22c660ae56a2b11877d20a045c5cca0d875e61d05 SHA512 ac6d66e9b7cf8921e91e9c47dcec9f285a45309fcfcbe0dcbce945506e7e2bb100ac019e4966f7e0d7ab9d465aa58edb024d740afac25cbf4d656a9f76e3ed8a WHIRLPOOL 50094d150d70b9e30671886cb2d588da8d152d01cc7ae7d51f2e32a49f23de63ad82ee9c15bf946d110397cdd3c8fdb1311eec405a72154aaff8292202ef4391
 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.2-fix-existing.patch 1277 SHA256 0c2a9ddd53f8744815fa1d5a5519578c723d45742f6c57aca08c690e8db3cba2 SHA512 543c561c03b60c884715808f1e9efcc2b932f4560521a4d5e7ab0c6800e1763ba2323810cb1e81add549414108247bba44c326d3e730e60ca4208898d0ce3d0f WHIRLPOOL f79174b734b9bdec17ec3f09fb7094253637a3c142d2fb8c4986a0a265b7b84ca4191959af4985d8abdf7cb336daf1bcb6630729051efb3044c837897bef1adb
-AUX mc-4.8.2-mcedit-without-file-param-fix.patch 1550 SHA256 c511bd9184176a80a44640e896774a5bda9240f95e21e0335047f1b56d5d26ca SHA512 dbd0732a91fda1f3e956fa2722ad9d8ba3b37eae5925fcdb65fdab7387fc0b5ceb19fe059f393cefd9b3ba71e9073e141fa853a8c46fcc975745d480b4302998 WHIRLPOOL 0b3eb740e18c807d73a598676df61d46feebcb1c17ebb15993aa3dacf0c6850658d853d148e19a13858f0f7089f4ca325313ec7ddee70d230ca161a11164e162
-AUX mc-4.8.2-missing-do_panel_cd_stub_env.c 5448 SHA256 9338fc4b8c6f48e97c2f604bd07dd7d11d4fd367184c8907758f7ddf85cc6c13 SHA512 fea75149553a2e8214f76965aa1df1c71e073c1c693a3b902b9e8011c3e3d8fbd0c62d56c24e7c6aec51f6ea77eb5713cf948845b8a62e9abb80a9c3eefe1100 WHIRLPOOL f44c42ee3732fd7ec87acabaf56bfc7930ea87677cad3b725ab311c9ac8d3b35e9d5a0ed1fe60178a77801b17c47613e62a6039aed98956eab411397ef15e0ef
 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
-DIST mc-4.7.0.10.tar.bz2 2862849 SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb SHA512 6fb10a73aef44a3df6162def81204e09c6a73de56884ae4c0585750465eba73bdd70e8f694eff928e5fcfe4b2961d36417450a5fdc763a7325371a2febd1939e WHIRLPOOL 37d4d2bfbac4850af6d3c4ff5b14d196dbed2b681a2cf63a11eb4b4cbd28649fd4b1a3c038b5ac1c9c27cd29db6d21425278ef11ff81d9efbe833c0154480047
-DIST mc-4.7.0.3.tar.bz2 2793651 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7 SHA512 c4f7d672430a5db3c5fd03e28a80d7e03d3566c396e369044709df4d094abfe52c0b0eaa3f0d2387b5e122d8fbaf5b07bfb9d869b185660c0f367c178fbbdda4 WHIRLPOOL 9c97f08883df400ea48cfea0a6cdc2f778728d7aef35dafc2ed71b2edecc97734ffb8d7ce505cfb022089aaf8d1ffe1acb72a6e5cbf936776ad7aee1e08bab97
-DIST mc-4.7.5.2.tar.lzma 1943321 SHA256 ca362c629ea984b635e38e0912ec3a7ceb44facc18f0c17c17d6a114c14e7c26 SHA512 4707e3c7dfb875191a5fb309f7b9e2bea5c9d20240d7979ed59baceb1737627eb5f23d963509c742d2b8d53e474f9b277c6eed92813a3f2ceabe4d49018b9ae2 WHIRLPOOL 43df2df71a8c0d2935f4271a5e32cf793d2af2c51f61e6b7a6beaf1b6fc323ccfac81b7385789c6e8c3a1c7cb18b8d882af9726a5e75e2f3811db6c4de685d57
-DIST mc-4.7.5.6.tar.xz 1995148 SHA256 8fc20859eac824b062fb2862429579b75cdbfb8d9011f1a7793d516550af4ffd SHA512 a0120b48d72e97e81fc803d7d84d4e931a56d65d32209243d04a308770f6d8d4246ca31b0c9cdaedfffb8e1a4ef6f02bd06c72db68ba5e568ce20f3d6573e4a8 WHIRLPOOL 947d6fcf0dc40fd7f78aa2204dc8d899528a3aeacb3a3db73601314e122b5ea31b3d9b31ec92928c8cd098b497fe80662f44cf63570c6cbadf1c725b17a17ec8
+AUX mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch 2409 SHA256 3a1b4e333f8cdaf4264a70638396aabb64a05c220e192ec84e388c8054773aad SHA512 a1a106fc65e82cf2d4bbfb1b8da47533de39d05230a5808f0956e540ba222805f0308b77018df8f750efae63bd6f6e9d9da8d7d575bb4ae14db3e67c67745ae9 WHIRLPOOL ca1630173b22f41beec92497bed1b01b5c80808769fac835f8233107f84deff2f387df4b4e0ca584cda902c674a3df21c545ee083605194bcd41f961bb5c7061
 DIST mc-4.8.1.tar.xz 2057960 SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672 SHA512 39158429c78e959700411e4b3c714552cad4e8badedcf9c391e4807f27f35753dcf911427b4319ea22be03c7cf7b1a3ff494e6c1b8f90389e5d518f1bb9cfa1c WHIRLPOOL e34e6dad86fbc4a4d2f727094ddfbbc7a346161b04944f6ec65bc2c27770ece5c3c8f9d46aef021a007dc3b8b4eceb2b34b9c6d6e266a9c431969043d838f7d3
-DIST mc-4.8.2.tar.xz 2037408 SHA256 f761d5e92d57383819656388f3bb7f998734e474ba943630c6943778e355dc09 SHA512 935c9f231a8722da8e87772fe1cbca0634821fb0f56eda094fa85dc575393f6aba6b7ce6fc767e0f039ba686ecefca8be7034ee547e41d7a8458b354733738c0 WHIRLPOOL 2bc38a913f6a4a5475f611b842bf72d9632319af185dbd878bfff3766cfa9b07bbde7f8f60227bb7ce7f7d7d577bae829b7a62dde11b7549e039b02d935ff2d0
 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
-EBUILD mc-4.7.0.10.ebuild 1920 SHA256 aa80423b8a4c069b5be93cfdebb3f6d7848bddd96053c79c64f11b9fb34dfe9d SHA512 e93b714b54b5744b57c00f9da6167d8c60f31bfc1df4aec46fa25b8ffc8aed53a80ca3fe65ee8ab811596e27546a4a3940fb3d48feed72d10603aadead6259b8 WHIRLPOOL 57eb790a21f18835436ad50a970c626c33dbbb9b8d6a3eb0b9087d2b985f527ca94ea3aec6f071c4c6db22dd0a95c909265dbb8e667ec82c6f8ce577070cfc17
-EBUILD mc-4.7.0.3.ebuild 1708 SHA256 302da6d3a8512d17f40fc98789d60703f5e13fc02463e4cde5a3dcc6c7afc7f4 SHA512 947b03c552ffd252c76092d6b2953d87620565d1a869aa2a6ae0cd0e7b099ff5801cd04b64b2208548d47a5f58cbff612c53faa1b11488938cfd9fac32eec6ff WHIRLPOOL d8b50d5abce68fbea17c301cb1a3a4887b47d1873e49f4a04f419a771940c70a24dec44b73dcf58549bceaa050b114af6657995e1d683c7bc9224c3e4e40faed
-EBUILD mc-4.7.5.2.ebuild 1950 SHA256 69f4e76cc585611dd49a626314cc3050abca537ccdf93d1d7badd65c64253734 SHA512 adb3fd7174d2b7ea00441cb15851077cd68bd798645bb37577778b09c7d9a2329a4ccfaaa877520b79597a05d012115633585aa17ee81cf88e404c4e61d19f9f WHIRLPOOL a0d4571ca53078496444e28fac7b2cfc08e3d8f4de645f8b91d3097bdd3e518d576d845889869cb5dc8ecf306ad09129bdcf6b6630d115c893eeedee16d1d37f
-EBUILD mc-4.7.5.6-r1.ebuild 2045 SHA256 80443691c8da3c0e514800e9725995f196491f99d796f43274e3c1572f076d2b SHA512 390a2d3c1acbad0e8b62922adf7b94911cb1b3c4e913ef662649f6d50812c46542b266d32665f7e4c7dce1881085fe6002f479dd643453e723744077b6090c93 WHIRLPOOL 9abcb07beae3fcc0cc5c45e1e859f89b58c7aad7134c284a86cfbab0837fe1fefdf39947eaf4e36dbc67ecc71f677592024754e6427af2e22fac6c655056a1a2
 EBUILD mc-4.8.1-r1.ebuild 2405 SHA256 a0b04c7ad1d21ecdbe77b9eb4040803e13c3e0f6d7e0662063b001ca26cb69c9 SHA512 8b8a70f7b93bd171433cdc9422fe965173fe3cfad58a73626531e16b50460a91bd52c652736e808302c18343cf16423fc1b60e51e3217ed462823f545a84db79 WHIRLPOOL 215b143b9957684ad1f65abaf9318df911f5572d2a80eb66a0acd5a0d4ff30f0c0d16f8b5db2b9bbad252acb75a9e4cfcb8bb035a87c88afcb0c36f1f174edc8
-EBUILD mc-4.8.1-r2.ebuild 2366 SHA256 f608a9bde5d80a344f661c0a6d7be38d606d83f6453bd12860800085d565d9cb SHA512 af743ac1edfae031b97ddba3a7021b8e9366b0d40e1c76087c367e480ba035fd04195d561e834ed0b7edce08b0b3a63eb1f0ae0a56000790314e1ee1f316f6ee WHIRLPOOL 383b729acd9dc420ca5308cf176bedacf7c9b8adf7cc9c54484b581f7a64a73ba23f49216cb1da42135f97901f5755eb0cdd281c209751d372b7dc4d599835c5
-EBUILD mc-4.8.2-r2.ebuild 2341 SHA256 9287705c2c045f1cd7f495b242259b16c2a30cf758d93ab811950341d8843610 SHA512 f55c3e3a9b064625bc4c2b168a25e78f482b0ab8279c5f7375160119c12c0551da9539f9fee25a9476c68605f933d374dd96df65d406b0d4e6a1cb759fddda70 WHIRLPOOL 471ab2e9191da6e5800769d8192e3da3f4cb8677daf0e801d1e1d4d7af2c5c1772174ac4aef5498f220c8dcb223972a8f5bc55f44aa27559c78a67b026e90b3e
 EBUILD mc-4.8.3-r2.ebuild 2352 SHA256 9b5efa00bd2b1ddd58c4536ddf8d0052ac262a7785f3a4db5c3170ee43519997 SHA512 09287c79c1aa74fe7988183b493664454e8ae557c94d9dff940555aacc6281f2116ff98e4573db278e9820b1bc970049e3dad8917d6785908e98599b2ae1d5a8 WHIRLPOOL 1ca0ea41a718014893a354fa017a2176b9fe8708a2983a5f2f360725d8012999919b5cd8aaed083564699d9db009dba4028bbfb3208f42d629f7a52d97ec4adf
-EBUILD mc-4.8.4.ebuild 2447 SHA256 a3461f522ee2f09e693636e422750b0145a8c3e566adab627dd726d20393fd03 SHA512 7dd7fca21e3263b60ebe0ef59589a798bcfb6a012db8e732813482a841b73893ffc3b12d708fd945fed8f6ed58cdb70ed3412cadfe20015bd8ec50358b4741ba WHIRLPOOL 670bbf0e0a8908eac3c7b29e65e6e6c5bc1b805da0dbc5da41c6a8d2dd5162cb2431018a25f79cd6a387c09e8db6ad555e5fdd4e452df7417cfa9537589f3aae
+EBUILD mc-4.8.4-r1.ebuild 2616 SHA256 792249bd642d06ec35cd6900e9488d7a72a3b3cece06cec5ee329dbcaf3a4298 SHA512 08f9459fd70e00660bc012159cf36eacd3f478cc9326fa9d8447f831ebffc99d244fc3e43f167786fd0d9df0fdb748fe403dc741a656abc683bb9a804f9ad199 WHIRLPOOL 22f15de5e0728b735a9e4b952e26f40582c511100db29c67770e43b7da50e509189bc10e88dd2f2e5e12383f67913182b2eec840b1068b2d272d8e587c2c9976
 EBUILD mc-9999.ebuild 2979 SHA256 174ee6aa6cc3a5b05038e1fd1e663b8f103b2b5f57af80f08396fc6bd141a75c SHA512 8f0e50804e7711a69a9a30c5864432095495b362c84f54bb83e91217ca6c9fbea0dd3d002b43665de6e85aa4bf1b60e77f31b4abb0fc25abe71dc38a3eea2cb8 WHIRLPOOL 81c9a6fe141c2ac32e18a3d3292793d0e93949d3d8e8106c9b98bb3d8bb444affbc0f9fec38ada7e90c08b32fc43babfb2e3a0ec2ea46353568120ffe9845935
-MISC ChangeLog 38082 SHA256 e7ca98aec1bc11c1877f4ab0e3a8c7e29caca35e6ca415daace0d5a1e3ae276b SHA512 584d36652f5070a06700c543e9be66bb307ba2c4ff17c91389b542c279844164fb64571cbf37a39e94938feb298c166a599faa8ea858bc1ed0fbf7ea623639b4 WHIRLPOOL 93103ddd1b7eaf7c57c0ae7c3f14068ad3de2e2fc5892cecf221e35996e47eae17d063e2c534b693a68a2c5e7035e1e564b59ae7bc65d96315177f39abf2708a
+MISC ChangeLog 38785 SHA256 d6d16cb66a3291e9a03de3f13e2a77a428161259d7f95f80e687839c1e11a097 SHA512 f578092629b5c43a0cc710504085cb440693cabcbb3b9ff74946b21210f1036d2b0fe555a9b51c7b03782543d44f77edef000aedef8947e3cf812287b0de91f2 WHIRLPOOL 84c6a6319626dcab1c5d3414a8b9649da838f37fcf3824074588a22810bef4c9f1a53351598cf76d17c915473c848ece1afd319e1c41c5923ab0658b7bad4f1d
 MISC metadata.xml 846 SHA256 2ce5d9e8575133f3b3ef99fabbb133b0eeccf26ff346970dd034b16dd7b05fe9 SHA512 522568197614833eea1a6322b8b96f5f70f3c27d0aed734b7271d46f27852a97d6e20fa1bc3fa028c2fccb97d4b87d177f87dea1ac3d5f7d5d5330c84a39e68c WHIRLPOOL c6cee8edfb33b4160c143769f9581b90198eab76a5d324eb65795b4513609f49cd50661f4680a705be8458ef883eab5e8d491e7008c352a6359378eeff30850d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAKkvsACgkQcaHudmEf86oV4gCfdoglAv642nLgIQaJPkFYHqHI
-hNUAn1SRZiJaeRK832YXttYLHwCQZJq7
-=JyXX
+iEYEAREIAAYFAlAK01IACgkQcaHudmEf86rVEQCfcoTSnPWgCkyI6MOSs/2R84aH
+0y0An1hS7RapvRb+RXsED4TehPucOeQq
+=FcqI
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch b/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch
deleted file mode 100644
index 8944690261ad..000000000000
--- a/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 95c553c46770f89f09c4408cbdf61ed76b4a8766
-Author: Sergey <sergemp@mail.ru>
-Date:   Thu Oct 20 14:28:39 2011 +0300
-
-    Ticket #2635: mc adds spaces an the beginning of all files/dirs at the ftp server
-    
-    For FTP servers, that do not send ".." in directory listing, mc adds one space to the name of every file and directory. Attached patch should fix this problem.
-    
-    Steps to reproduce:
-    cd /#ftp:ftp.symantec.com
-    
-    Expected result:
-    Correct list of files/directories
-    
-    Actual result:
-    File/directory names with leading spaces
-    
-    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
-
-diff --git a/lib/vfs/parse_ls_vga.c b/lib/vfs/parse_ls_vga.c
-index 8091c14..5424ee9 100644
---- a/lib/vfs/parse_ls_vga.c
-+++ b/lib/vfs/parse_ls_vga.c
-@@ -657,7 +657,7 @@ vfs_split_text (char *p)
- void
- vfs_parse_ls_lga_init (void)
- {
--    vfs_parce_ls_final_num_spaces = 0;
-+    vfs_parce_ls_final_num_spaces = 1;
- }
- 
- /* --------------------------------------------------------------------------------------------- */
diff --git a/app-misc/mc/files/mc-4.8.0-fix-nls.patch b/app-misc/mc/files/mc-4.8.0-fix-nls.patch
deleted file mode 100644
index d77c4cc459fd..000000000000
--- a/app-misc/mc/files/mc-4.8.0-fix-nls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fixes bug found by Nikos Chantziaras
-https://bugs.gentoo.org/show_bug.cgi?id=387949
-Picked from upstream development branch.
-
->  main.c: In function 'main':
->  main.c:384:44: error: expected expression before ';' token
->  main.c:385:29: error: expected expression before ';' token
-
-commit 84320a33d8f9027c70a8d972b69b1ffc824c5a8d
-Author: Andrew Borodin <aborodin@vmail.ru>
-Date:   Thu Oct 20 15:42:15 2011 +0400
-
-    Ticket #????: cleanup.
-    
-    Fixed build with --disable-nls option.
-    
-    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
-
-diff --git a/src/main.c b/src/main.c
-index 9d442f2..e854719 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -381,8 +381,10 @@ main (int argc, char *argv[])
- 
-     /* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */
-     (void) setlocale (LC_ALL, "");
-+#ifdef ENABLE_NLS
-     (void) bindtextdomain ("mc", LOCALEDIR);
-     (void) textdomain ("mc");
-+#endif
- 
-     if (!events_init (&error))
-     {
diff --git a/app-misc/mc/files/mc-4.8.2-fix-existing.patch b/app-misc/mc/files/mc-4.8.2-fix-existing.patch
deleted file mode 100644
index fbb1e6fba3b0..000000000000
--- a/app-misc/mc/files/mc-4.8.2-fix-existing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 2a5885fb7f5ce7af3576fa17ce697adbd9b61567
-Author: Slava Zanko <slavazanko@gmail.com>
-Date:   Fri Mar 23 13:40:25 2012 +0300
-
-    Ticket #2761: save file on top of existing directory changes dir's permissions
-    
-    Steps to reproduce:
-    
-    mkdir foo
-    chmod 0700 foo
-    mcedit bar
-    ls -ld foo
-    drw-r--r-- 1 slyfox users 0 Mar 22 22:10 foo
-    
-    We've lost dir's permissions.
-    
-    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
-
-diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
-index 8e6c9a9..d52e48b 100644
---- a/src/editor/editcmd.c
-+++ b/src/editor/editcmd.c
-@@ -1488,6 +1488,15 @@ edit_save_as_cmd (WEdit * edit)
-             if (vfs_path_cmp (edit->filename_vpath, exp_vpath) != 0)
-             {
-                 int file;
-+                struct stat sb;
-+
-+                if (mc_stat (exp_vpath, &sb) == 0 && !S_ISREG (sb.st_mode))
-+                {
-+                    edit_error_dialog (_("Save as"),
-+                                       get_sys_error (_
-+                                                      ("Cannot save: destination is not a regular file")));
-+                    goto ret;
-+                }
- 
-                 different_filename = 1;
-                 file = mc_open (exp_vpath, O_RDONLY | O_BINARY);
diff --git a/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch b/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch
deleted file mode 100644
index 7252292775a6..000000000000
--- a/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-fixes mcedit not running without a file parameter
-
-https://bugs.gentoo.org/show_bug.cgi?id=409107
-https://www.midnight-commander.org/ticket/2754
-https://www.midnight-commander.org/changeset/529a7ba24c9da9fdb1df939ff0fe35c6d27e65df
-
---- src/filemanager/ext.c
-+++ src/filemanager/ext.c
-@@ -637,4 +637,7 @@
-     int have_type = 0;          /* Flag used by regex_check_type() */
- 
-+    if (filename_vpath == NULL)
-+        return 0;
-+
-     /* Check for the special View:%d parameter */
-     if (strncmp (action, "View:", 5) == 0)
---- src/filemanager/midnight.c
-+++ src/filemanager/midnight.c
-@@ -952,9 +952,11 @@
-     case MC_RUN_EDITOR:
-         {
--            vfs_path_t *param_vpath;
--
--            param_vpath = vfs_path_from_str (mc_run_param0);
--            ret = edit_file (param_vpath, mc_args__edit_start_line);
--            vfs_path_free (param_vpath);
-+            vfs_path_t *vpath = NULL;
-+
-+            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
-+                vpath = vfs_path_from_str (mc_run_param0);
-+
-+            ret = edit_file (vpath, mc_args__edit_start_line);
-+            vfs_path_free (vpath);
-         }
-         break;
-@@ -962,7 +964,9 @@
-     case MC_RUN_VIEWER:
-         {
--            vfs_path_t *vpath;
--
--            vpath = prepend_cwd_on_local (mc_run_param0);
-+            vfs_path_t *vpath = NULL;
-+
-+            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
-+                vpath = prepend_cwd_on_local (mc_run_param0);
-+
-             view_file (vpath, 0, 1);
-             vfs_path_free (vpath);
diff --git a/app-misc/mc/files/mc-4.8.2-missing-do_panel_cd_stub_env.c b/app-misc/mc/files/mc-4.8.2-missing-do_panel_cd_stub_env.c
deleted file mode 100644
index 22fba1543ffd..000000000000
--- a/app-misc/mc/files/mc-4.8.2-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 char *path, dir_list * list, sortfn * sort, gboolean reverse,
-                 gboolean case_sensitive, gboolean exec_ff, const char *fltr)
-{
-    (void) path;
-    (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
new file mode 100644
index 000000000000..a200f56b83d5
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch
@@ -0,0 +1,87 @@
+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/mc-4.7.0.10.ebuild b/app-misc/mc/mc-4.7.0.10.ebuild
deleted file mode 100644
index 7523c0a8963d..000000000000
--- a/app-misc/mc/mc-4.7.0.10.ebuild
+++ /dev/null
@@ -1,71 +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.7.0.10.ebuild,v 1.2 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=3
-
-inherit base
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba slang X"
-
-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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_with samba) \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-
-	# fix bug #334383
-	fowners root:tty /usr/libexec/mc/cons.saver ||
-		die "setting cons.saver's owner failed"
-	fperms g+s /usr/libexec/mc/cons.saver ||
-		die "setting cons.saver's permissions failed"
-}
-
-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.7.0.3.ebuild b/app-misc/mc/mc-4.7.0.3.ebuild
deleted file mode 100644
index 5e103a04900e..000000000000
--- a/app-misc/mc/mc-4.7.0.3.ebuild
+++ /dev/null
@@ -1,65 +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.7.0.3.ebuild,v 1.7 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=3
-
-inherit base
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba slang X"
-
-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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_with samba) \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-}
-
-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.7.5.2.ebuild b/app-misc/mc/mc-4.7.5.2.ebuild
deleted file mode 100644
index 7032cdd7e985..000000000000
--- a/app-misc/mc/mc-4.7.5.2.ebuild
+++ /dev/null
@@ -1,74 +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.7.5.2.ebuild,v 1.9 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=4
-
-inherit base
-
-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.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm +ncurses nls samba slang X"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	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 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--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)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's owner failed"
-		fperms g+s /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's permissions failed"
-	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.7.5.6-r1.ebuild b/app-misc/mc/mc-4.7.5.6-r1.ebuild
deleted file mode 100644
index ae2ae436008e..000000000000
--- a/app-misc/mc/mc-4.7.5.6-r1.ebuild
+++ /dev/null
@@ -1,75 +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.7.5.6-r1.ebuild,v 1.2 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=4
-
-inherit base 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-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm +ncurses nls samba slang X"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	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 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	econf \
-		--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)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's owner failed"
-		fperms g+s /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's permissions failed"
-	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.1-r2.ebuild b/app-misc/mc/mc-4.8.1-r2.ebuild
deleted file mode 100644
index 43bf76ff79a8..000000000000
--- a/app-misc/mc/mc-4.8.1-r2.ebuild
+++ /dev/null
@@ -1,90 +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.1-r2.ebuild,v 1.3 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=4
-
-inherit autotools 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 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	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() {
-	epatch "${FILESDIR}"/${PN}-4.8.1-fix-fallocate-xBSD.patch
-	epatch "${FILESDIR}"/${PN}-4.8.1-muldefs.patch #403343
-	epatch "${FILESDIR}"/${PN}-4.8.1-fix-vfs-test.patch #403343
-
-	# patch above changed .m4 bits
-	eautoreconf
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--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.2-r2.ebuild b/app-misc/mc/mc-4.8.2-r2.ebuild
deleted file mode 100644
index 01833ed751a9..000000000000
--- a/app-misc/mc/mc-4.8.2-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.2-r2.ebuild,v 1.3 2012/06/01 01:59:55 zmedico 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 ~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 409107
-	epatch "${FILESDIR}"/"${P}"-mcedit-without-file-param-fix.patch
-	# bug 409365
-	epatch "${FILESDIR}"/"${P}"-fix-existing.patch
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--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.ebuild b/app-misc/mc/mc-4.8.4-r1.ebuild
index e798a3be30f6..eceb319faa57 100644
--- a/app-misc/mc/mc-4.8.4.ebuild
+++ b/app-misc/mc/mc-4.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2012/07/18 21:58:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.4-r1.ebuild,v 1.1 2012/07/21 15:59:49 slyfox Exp $
 
 EAPI=4
 
@@ -15,7 +15,9 @@ 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 test X +xdg"
+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 )
@@ -24,6 +26,7 @@ RDEPEND=">=dev-libs/glib-2.8:2
 	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
@@ -47,6 +50,8 @@ done
 
 src_prepare() {
 	strip-linguas ${LANGS}
+
+	epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch
 }
 
 S=${WORKDIR}/${MY_P}
@@ -68,6 +73,7 @@ src_configure() {
 		$(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) \