Revision bump to fix bug #403863 and bug #461284. Fixed unquoted variable in live ebuild. Removed old versions

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

10 files changed, 89 insertions, 389 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index ecbbd177e4d2..ae74bdf827e8 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,17 @@
 # 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.282 2013/07/03 07:35:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.283 2013/07/09 10:11:06 polynomial-c Exp $
+
+*mc-4.8.8-r2 (09 Jul 2013)
+
+  09 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -mc-4.8.1-r1.ebuild,
+  -mc-4.8.8.ebuild, +mc-4.8.8-r2.ebuild, mc-9999.ebuild,
+  -files/mc-4.8.1-fix-vfs-test.patch, -files/mc-4.8.1-muldefs.patch,
+  -files/mc-4.8.1-muldefs-in.patch,
+  +files/mc-4.8.8-race_cond_create_tmp_dir.patch,
+  +files/mc-4.8.8-wrong_char_in_menu_file.patch:
+  Revision bump to fix bug #403863 and bug #461284. Fixed unquoted variable in
+  live ebuild. Removed old versions.
 
   03 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org>
   +files/mc-4.8.9-unknown-opts.patch, mc-9999.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ac626e643adc..078b7ee8662c 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,26 +1,33 @@
 -----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.8-race_cond_create_tmp_dir.patch 1499 SHA256 0af9a0d05ee09228e3ba25c98b7be0889434f95ce69d5f05e0567b240702bcdd SHA512 fd62bd705fd181b8c1b61f4553e72ae1b0c725866bbd5a7bd9005ca30273396ad6fa2226f8098038dd83f2ea1c0293cb8b620bd6899c50232f33b573ddd28892 WHIRLPOOL 82bd2eb6d7eca5183d904f2f6a5c0154ee8e47605a5bdbb0cd42ec57aac07b1892f34deb508deeea942d6f0c7e4c0a4df7e5e6c79c05b230b2168de98716dce9
 AUX mc-4.8.8-segfault-unowned-temp-dir.patch 616 SHA256 ff93342257e4374683b6a7d0ef86624976882018d8a7a28a5830b8129030b93a SHA512 0f29cf1d4f112215cfbf01003995b8f4ce25e043bff79269056df503f1b3e4fe388ffa035aa7ab7bbf3171b006b6f79ae0d6788318c4f62e759f7443da5daa67 WHIRLPOOL 62a1a2b6d4b29ea9365bbc96fcfd44b974e6de14ad09b864da2c8fe5d5a8035cb580d1fe82197b9b9ca966f83245a9dd1cb1956a5ec62eea0d497de7c7e34f6b
+AUX mc-4.8.8-wrong_char_in_menu_file.patch 446 SHA256 4d1f00625e2520a02fad586109b862d9560bd4d2c187e87eb2b27df668e663e7 SHA512 b363e57af6d895408f2f7e0e9a7e57c560a3587871e0be16761493e642732a8683908a0be6e8d22d0b62c732c021f35d6a3170f2b02a15135c745b3d47adb3a1 WHIRLPOOL f73d08e2a0e8c8689d942cdacf1ce9417bd7292b35c52d9806bba04a5067789af75de69b87ccde4679bd9c0520fa2219b553d08dbcbadb4acb9fffe462220555
 AUX mc-4.8.9-unknown-opts.patch 1385 SHA256 2d409692ed2dd31aed467dcfe98652d683e1c60d502fbcd6019396b6a0bd9128 SHA512 0b16900dd6218ddc5bf158934aa49c76358fd697f21c1281c1fffded74178078c40e4a9dfec125b54f29b49670e7584a1e9a86c15b687f23256a98ebe16f1ae8 WHIRLPOOL 18ace284ec320e5933694135acedfde641091b6752091932fb8f39b02f4aaf8ecd2e7ca294c86ceec3ef9ff45232a5af8e00484390f0bde195231e873d963e9d
-DIST mc-4.8.1.tar.xz 2057960 SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672 SHA512 39158429c78e959700411e4b3c714552cad4e8badedcf9c391e4807f27f35753dcf911427b4319ea22be03c7cf7b1a3ff494e6c1b8f90389e5d518f1bb9cfa1c WHIRLPOOL e34e6dad86fbc4a4d2f727094ddfbbc7a346161b04944f6ec65bc2c27770ece5c3c8f9d46aef021a007dc3b8b4eceb2b34b9c6d6e266a9c431969043d838f7d3
 DIST mc-4.8.7.tar.xz 2106020 SHA256 88f620f7944d629087e0f3518a7e7bff7600fd1c4fa157767cdcca95f2cb3074 SHA512 f5c0f533e4e056246d5918233b9932f751589db613f1c591be3168b607a9b73919e93b631151c1c4dbc692b54e7ec1b2f8ec2ae875a24012744e7257735fa1d8 WHIRLPOOL 768b08f2ff0ce1de8893aec2a083269ecde6c62e6e7ea5379a96eec81ad56791e4adbfe712014cece323857fb96862a29dc97893b53f8d5316707e933f015342
 DIST mc-4.8.8.tar.xz 2150988 SHA256 b898a343b2b11274a20b2a491f9f5422b6d041e65e152c56d7255084fd04b78b SHA512 407998e653d0758ff47c13d2d47c77628b764ec5e51369fe0ff28d31962d8d4635e23fade2d159bf6b063c8b84e3e3f558c3b3155d3358e520c3436a57412815 WHIRLPOOL 1785a836bf5070e52f75fd120031829ced772c9b3bdacf517b2e03f05ca850144960fe17f4f283d256ee46e3f3d9c3d104ac0110637534feae2ca684f18bd032
-EBUILD mc-4.8.1-r1.ebuild 2434 SHA256 6a522cc7848b82af67a0782b2aba63f4826f6a676f53cbf9c0e140ad64761faa SHA512 809c3b90c3b46208472b8257e0ae6dbd057cb42908f0e35cae6374f1d147755c37967947e7b167c42ead342cd12ac47ff2ba5c4f4dd16a2b75e7cad1fa6e391e WHIRLPOOL 3747c38ffe32e2cddea165f219b367d3154470d0e6b2bcd529cf450641c1283b51cb015b40f745a195e2461b7b8da022e91130e3da4b7842f68b77cb8b94f680
 EBUILD mc-4.8.7-r1.ebuild 2584 SHA256 9580d8c4cdc3e049a6944413883408f179c91b2ebe632961b289c756aeff71b3 SHA512 428780c34773ff31d303e778e5217b6fe3fa1d021e744e739eee498abdf8ea9af699d38a8c0b4b249ee296eab34b338d781b8f1268591b653a2e6ff46eaba90a WHIRLPOOL e8705544a5563cdb00c829251abb22da4a18ab6d3016a0b33d74453a7eb5b57928b69b1f9ce59cdc02448c1c66ddf9fd66d1cadc4a0589b9542e40b37b38ab30
 EBUILD mc-4.8.7.ebuild 2432 SHA256 a864d67d423f9464a8a49ac5dacd39ddf4028a8b57f1971690131df027830266 SHA512 43dc2f81174b3b2ea952b58f60761065b802f7805087cc4011d368333f85b6d41ded6da09faf65dacbf2ce0888fc38d1ac2eaa966f06392429587f16dbd3d683 WHIRLPOOL 45cfba16d83c6ee02f1c3b14034988d29100dc1b23242e638a83474e056219ba53e0ad718c5e8283ab49a24d00517692b0228d0ad3283f9b3841b3c4a7480326
 EBUILD mc-4.8.8-r1.ebuild 2652 SHA256 cb3fa202f6db4ba98f05b5a721612b753b5b2d6738dcecfa2bed75f10298ce2e SHA512 fc8e3bbc465f262d555542ab190208cd1a6e15fc473dd260d6f18958e7999b2d64545617edcd835e770fa71daecaed24e0bbdedb05500c09853b48f809a3c823 WHIRLPOOL 526b3cd7d17d7a2e95a52cf56101fb6a9129f9094f97acfa3d6352b51b004d1e2a138f2092cd5e4fda2ba936e1b04f548ad660820ebe00f2f69cfa22324e67c3
-EBUILD mc-4.8.8.ebuild 2575 SHA256 00366553f5fbcee8ed00808aee186e49dea688f3a007128672b05d384414a7ad SHA512 534bff87765b1ff6745ab0d3850b87cee5893ca80c459347e7b6848d1e7cb4929f1040d971efc05a75ace92383f43ab78f2879de1545c2d545893ffdc8e21b25 WHIRLPOOL 75d980a57f96fb913aef3e1bd900e262ccc98cebd9c87477b4cde42a58c9386c0ee29653d9b2c077f3594ba90534481876b4b600d7664d197f23b1352e95035d
-EBUILD mc-9999.ebuild 2787 SHA256 7b525eac9a10fc438363081fbca54f89fa42f35db10b78593d551e714bd1ae4f SHA512 7d7f7371e73292dfb0697f38fa09c07a03ee7b07d3ae87a0a62cc0c07f3cd454e669d86c51777a940253d5fb39633c01000e8d46051d2808db19ad7b243b19bd WHIRLPOOL 96ba000cb0715775d471fdb330dfdf0aeaae2109a66e33dabbf9cb762d6c9dabfde92611eacad3c5f91e324f658cd86d60da8d951b39ee717d52bbff6a10fc4d
-MISC ChangeLog 42667 SHA256 8fe2f38488ade4d10ba0081ee2f13a156b488a70b9f5cba063cacb8f7470f2c7 SHA512 aa5794d1dccc405286f83b8410974c789ffeb3fcea20a99656524c8d0aa4fd45458f0544a55de989f50209868b7bd43fca48e53f78f6d850f4f57b61964a7a43 WHIRLPOOL 36035a1e7ebac95caac7e10e49eb3dae357ccc15861c18e0ff7a7decb02c55f111f4c5130b410fcb383a5b59a301befcd0487606209442979ede6c8a749def3f
+EBUILD mc-4.8.8-r2.ebuild 2804 SHA256 62178e8f1341c51302588a8b7b86247d1066d05c5f07c5694a6a184605177970 SHA512 79359a05e48dbb935b7e6451162be4646cdb6efc752af8fdaf5592cf7a8392d9f22ac9693cbb03d0c937473e813f2a0e4c61313aca67f439343432ab51f303c4 WHIRLPOOL c8ba0bb54b94d963fc59611548b141a0a6d66163b2c0d868515f4dd3c7564735f63558c74834030d68cef7a1dca3a95895124db6cd68b3bbc629ea2feb6d177f
+EBUILD mc-9999.ebuild 2795 SHA256 8880f5840951d6d264d171d59fb44c8f222d999ce457faea8ab1d0561aa560ee SHA512 89e3e635d43d2b86077fa41b23396b4f0a155bce6ee404cf7381be3be8191e3e725ae031cde7c4a233e89d41a83b83f514aeb8e577860038ebe64f4fdcfa38aa WHIRLPOOL 8ede6d75658ec053076e6841a461a5c9d7a8ff27d1a52060d777e27a9a0f85e70b5323f0ae22e437ee17a53bbb01048cba9e15c5f583871fe26980c6c39d4dd8
+MISC ChangeLog 43154 SHA256 e69502e7615f088647ba6f4816b7449c6195cfb5531cdf11bfb1a78f71076cb5 SHA512 0cbc4edeb9dfd05242cd0202ae96d162463957184acab7f8a37dceaa4807c4dbddfc1cc855b573673864e5fab1d9039a26553734591cfb9eb5ec8c93dfffebc7 WHIRLPOOL 5ae4092e833a19b713ed8461d2c7e406c267cf083461bf6f5a90291d4ecc82ab36463eeb52d514a1300d66201712aad15ffeafa5ade92f8d2723cf3e97297a93
 MISC metadata.xml 950 SHA256 7a5f3db095ee82a58da8299170da072eb298919ae2beec7020e2ca12982b3263 SHA512 9143eda1ccedb0613eb915f30e70259c32b5075669e256c43c488c1baf34ffecb3210583144bf0389af463fdbc98f60f5d781b6afa77f1951cba11b16555132b WHIRLPOOL cbcc220f6ba1de379b0225d0079945991362aadf88df2aac225994841ec7c81f5132ef3a0b506433d46abe445673dc7dc406fce37dc5e04a17179c6858a3bdea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHT09sACgkQcaHudmEf86qStQCfRupQ+NiIGTFhy2U0jY+d4jwD
-WdsAn2v9aGHFJP6nPwEjGkNWyAQaGUEn
-=JytA
+iQIcBAEBCAAGBQJR2+G7AAoJEPiazRVxLXTFaTEP/RroTFLxU+690LQ8aLcbZycc
+KSJ5XiD7tvHuDEGm1dQ1b/YEPboEEhHT3tC6UqnP1KBCbjzMWLDuVs5ekEcFdGtT
+5SjdFZ45Vzhp0M9ZxcjLJ5x4T/xxrM26N9jMyo1j6rR42rb5VhPI97P66orT4sfX
+UgCBSfHt7d4h3ZiUIi/7JhhxgZpdPPQ5iCFeIN9HyDx2aQIoSC6Cfkp0jtcXoayF
+i9fQbDkbj76rQzfPt6zNMyTc1O2yTxePlGEnNMY5ha8TqKvfJzZDQA6YBwzz4U6Y
+chBWvNnu9owj9IyYLbOooSi6IFWRA44PuCen8Cn6+HcCJTJdiewcS1aVbCN1c34a
+TTay36BTROsVzIRMRbuv5LQjkxYYf1i2wihEyBCDxPq+QZ5jlFUx/wFMyxriRd5T
+ZKNT29ISY468AdykTC02MjbUZy0LgnxLvEz5L4xvduXHm1OyAJo+bucCQ+ORaa04
+mFXu3jrl7o+7DMZ6OXgAmYujAbpjui4KDXjwzL/yWv+nFC1Fou+Dd9bK5WTE/4ot
+2zwdQYIVJllcK8zUH4M9A3eHJYNilnzUf6AVbupmrB2bOiOqeHSGK3cBIWwUbiVK
+2yZd/ByjPczl402lIsEyNM/BC25K1oYX3Q1BAHbCO/JzpLpxttfqeeU7y3gTVOT8
+m/yVGcxiMLqPlWV64E53
+=c8jY
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.1-fix-vfs-test.patch b/app-misc/mc/files/mc-4.8.1-fix-vfs-test.patch
deleted file mode 100644
index f3a7c047c6b8..000000000000
--- a/app-misc/mc/files/mc-4.8.1-fix-vfs-test.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-commit 931819039e78d7b1465077709988a611df4752c2
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Feb 13 14:14:50 2012 +0300
-
-    Ticket #2732: fix vfs test build failure on alpha
-    
-    The test fails to compile on alpha:
-    
-    >  CC     vfs_parse_ls_lga.o
-    > vfs_parse_ls_lga.c: In function ‘test_vfs_parse_ls_lga’:
-    > vfs_parse_ls_lga.c:174:9: error: unknown field ‘st_atime’ specified in initializer
-    > vfs_parse_ls_lga.c:175:9: error: unknown field ‘st_mtime’ specified in initializer
-    
-    as st_atime on alpha in not just a field name:
-    
-    struct stat {
-    ...
-        __extension__ union { struct timespec st_atim; struct { __time_t st_atime; unsigned long st_atimensec; }; };
-        __extension__ union { struct timespec st_mtim; struct { __time_t st_mtime; unsigned long st_mtimensec; }; };
-        __extension__ union { struct timespec st_ctim; struct { __time_t st_ctime; unsigned long st_ctimensec; }; };
-    };
-    
-    The fix switches to old-style struct initialization.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/tests/lib/vfs/vfs_parse_ls_lga.c b/tests/lib/vfs/vfs_parse_ls_lga.c
-index f44559d..d16711e 100644
---- a/tests/lib/vfs/vfs_parse_ls_lga.c
-+++ b/tests/lib/vfs/vfs_parse_ls_lga.c
-@@ -155,90 +155,88 @@ START_TEST (test_vfs_parse_ls_lga)
- {
-     size_t filepos = 0;
- 
-+    struct stat etalon_stat;
-+
-+    etalon_stat.st_dev = 0;
-+    etalon_stat.st_ino = 0;
-+    etalon_stat.st_mode = 0x41fd;
-+    etalon_stat.st_nlink = 10;
-+    etalon_stat.st_uid = 500;
-+    etalon_stat.st_gid = 500;
-+    etalon_stat.st_rdev = 0;
-+    etalon_stat.st_size = 4096;
-+    etalon_stat.st_blksize = 512;
-+    etalon_stat.st_blocks = 8;
-+    etalon_stat.st_atime = 1308838140;
-+    etalon_stat.st_mtime = 1308838140;
-+    etalon_stat.st_ctime = 1308838140;
-+
-     vfs_parse_ls_lga_init();
- 
-     check_vfs_parse_ls_lga_call(
-         "drwxrwxr-x   10 500      500          4096 Jun 23 17:09 build_root",
--        1, "build_root", NULL, (struct stat)
--        {
--        .st_dev = 0,
--        .st_ino = 0,
--        .st_mode = 0x41fd,
--        .st_nlink = 10,
--        .st_uid = 500,
--        .st_gid = 500,
--        .st_rdev = 0,
--        .st_size = 4096,
--        .st_blksize = 512,
--        .st_blocks = 8,
--        .st_atime = 1308838140,
--        .st_mtime = 1308838140,
--        .st_ctime = 1308838140
--        },
-+        1, "build_root", NULL, etalon_stat,
-         NULL
-     );
- 
-+    etalon_stat.st_dev = 0;
-+    etalon_stat.st_ino = 0;
-+    etalon_stat.st_mode = 0xa1ff;
-+    etalon_stat.st_nlink = 10;
-+    etalon_stat.st_uid = 500;
-+    etalon_stat.st_gid = 500;
-+    etalon_stat.st_rdev = 0;
-+    etalon_stat.st_size = 11;
-+    etalon_stat.st_blksize = 512;
-+    etalon_stat.st_blocks = 1;
-+    etalon_stat.st_atime = 1268431200;
-+    etalon_stat.st_mtime = 1268431200;
-+    etalon_stat.st_ctime = 1268431200;
-+
-     check_vfs_parse_ls_lga_call(
-         "lrwxrwxrwx    1 500      500            11 Mar 13  2010 COPYING -> doc/COPYING",
--        1, "COPYING", "doc/COPYING",
--        (struct stat)
--        {
--        .st_dev = 0,
--        .st_ino = 0,
--        .st_mode = 0xa1ff,
--        .st_nlink = 10,
--        .st_uid = 500,
--        .st_gid = 500,
--        .st_rdev = 0,
--        .st_size = 11,
--        .st_blksize = 512,
--        .st_blocks = 1,
--        .st_atime = 1268431200,
--        .st_mtime = 1268431200,
--        .st_ctime = 1268431200
--        },
-+        1, "COPYING", "doc/COPYING", etalon_stat,
-         NULL
-     );
- 
-+    etalon_stat.st_dev = 0;
-+    etalon_stat.st_ino = 0;
-+    etalon_stat.st_mode = 0x41fd;
-+    etalon_stat.st_nlink = 10;
-+    etalon_stat.st_uid = 500;
-+    etalon_stat.st_gid = 500;
-+    etalon_stat.st_rdev = 0;
-+    etalon_stat.st_size = 4096;
-+    etalon_stat.st_blksize = 512;
-+    etalon_stat.st_blocks = 8;
-+    etalon_stat.st_atime = 1308838140;
-+    etalon_stat.st_mtime = 1308838140;
-+    etalon_stat.st_ctime = 1308838140;
-+
-     check_vfs_parse_ls_lga_call(
-         "drwxrwxr-x   10 500      500          4096 Jun 23 17:09 ..",
--        1, "..", NULL, (struct stat)
--        {
--        .st_dev = 0,
--        .st_ino = 0,
--        .st_mode = 0x41fd,
--        .st_nlink = 10,
--        .st_uid = 500,
--        .st_gid = 500,
--        .st_rdev = 0,
--        .st_size = 4096,
--        .st_blksize = 512,
--        .st_blocks = 8,
--        .st_atime = 1308838140,
--        .st_mtime = 1308838140,
--        .st_ctime = 1308838140
--        },
-+        1, "..", NULL, etalon_stat,
-         &filepos
-     );
- 
-+
-+    etalon_stat.st_dev = 0;
-+    etalon_stat.st_ino = 0;
-+    etalon_stat.st_mode = 0x41fd;
-+    etalon_stat.st_nlink = 10;
-+    etalon_stat.st_uid = 500;
-+    etalon_stat.st_gid = 500;
-+    etalon_stat.st_rdev = 0;
-+    etalon_stat.st_size = 4096;
-+    etalon_stat.st_blksize = 512;
-+    etalon_stat.st_blocks = 8;
-+    etalon_stat.st_atime = 1308838140;
-+    etalon_stat.st_mtime = 1308838140;
-+    etalon_stat.st_ctime = 1308838140;
-+
-     check_vfs_parse_ls_lga_call(
-         "drwxrwxr-x   10 500      500          4096 Jun 23 17:09   build_root",
--        1, "build_root", NULL, (struct stat)
--        {
--        .st_dev = 0,
--        .st_ino = 0,
--        .st_mode = 0x41fd,
--        .st_nlink = 10,
--        .st_uid = 500,
--        .st_gid = 500,
--        .st_rdev = 0,
--        .st_size = 4096,
--        .st_blksize = 512,
--        .st_blocks = 8,
--        .st_atime = 1308838140,
--        .st_mtime = 1308838140,
--        .st_ctime = 1308838140
--        },
-+        1, "build_root", NULL, etalon_stat,
-         &filepos
-     );
- 
diff --git a/app-misc/mc/files/mc-4.8.1-muldefs-in.patch b/app-misc/mc/files/mc-4.8.1-muldefs-in.patch
deleted file mode 100644
index 2f0a9068dbcc..000000000000
--- a/app-misc/mc/files/mc-4.8.1-muldefs-in.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Just to avoid running autotools.
-Real fix is in 'mc-4.8.1-muldefs.patch' patch.
-diff --git a/tests/lib/mcconfig/Makefile.in b/tests/lib/mcconfig/Makefile.in
-index 1e180ce..d224786 100644
---- a/tests/lib/mcconfig/Makefile.in
-+++ b/tests/lib/mcconfig/Makefile.in
-@@ -339,7 +339,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
--	-DWORKDIR=\"$(abs_builddir)\"  -z muldefs
-+	-DWORKDIR=\"$(abs_builddir)\"
- 
- AM_LDFLAGS = -z muldefs
- config_string_SOURCES = \
-diff --git a/tests/lib/vfs/Makefile.in b/tests/lib/vfs/Makefile.in
-index 1d08d8d..864d79d 100644
---- a/tests/lib/vfs/Makefile.in
-+++ b/tests/lib/vfs/Makefile.in
-@@ -380,7 +380,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
--	-DTEST_SHARE_DIR=\"$(abs_srcdir)\" -z muldefs
-+	-DTEST_SHARE_DIR=\"$(abs_srcdir)\"
- 
- AM_LDFLAGS = -z muldefs
- EXTRA_DIST = mc.charsets
-diff --git a/tests/lib/mcconfig/Makefile.in b/tests/lib/mcconfig/Makefile.in
-index d224786..739c2ba 100644
---- a/tests/lib/mcconfig/Makefile.in
-+++ b/tests/lib/mcconfig/Makefile.in
-@@ -341,7 +341,7 @@ top_srcdir = @top_srcdir@
- AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
- 	-DWORKDIR=\"$(abs_builddir)\"
- 
--AM_LDFLAGS = -z muldefs
-+AM_LDFLAGS = -Wl,-z,muldefs
- config_string_SOURCES = \
- 	config_string.c
- 
-diff --git a/tests/lib/vfs/Makefile.in b/tests/lib/vfs/Makefile.in
-index 864d79d..57c1ab5 100644
---- a/tests/lib/vfs/Makefile.in
-+++ b/tests/lib/vfs/Makefile.in
-@@ -382,7 +382,7 @@ top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
- 	-DTEST_SHARE_DIR=\"$(abs_srcdir)\"
- 
--AM_LDFLAGS = -z muldefs
-+AM_LDFLAGS = -Wl,-z,muldefs
- EXTRA_DIST = mc.charsets
- canonicalize_pathname_SOURCES = \
- 	canonicalize_pathname.c
diff --git a/app-misc/mc/files/mc-4.8.1-muldefs.patch b/app-misc/mc/files/mc-4.8.1-muldefs.patch
deleted file mode 100644
index 2155391a2b31..000000000000
--- a/app-misc/mc/files/mc-4.8.1-muldefs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 3e4d6d6b760e6f7043f26ee65ba415db7e9d47b2
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Feb 13 11:35:52 2012 +0300
-
-    Ticket #2732: tests/lib/vfs/Makefile.am: drop muldefs from CFLAGS
-    
-    Otherwise gcc on alpha/arm will break in gcc -c phase:
-    
-          CC     config_string.o
-        armv5tel-softfloat-linux-gnueabi-gcc <skip>  -z muldefs -c config_string.c
-        armv5tel-softfloat-linux-gnueabi-gcc: muldefs: No such file or directory
-        make[4]: *** [config_string.o] Error 1
-    
-    Gentoo-bug: http://bugs.gentoo.org/403343
-    Reported-by: Markus Meier
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/tests/lib/mcconfig/Makefile.am b/tests/lib/mcconfig/Makefile.am
-index fba2a7b..c706003 100644
---- a/tests/lib/mcconfig/Makefile.am
-+++ b/tests/lib/mcconfig/Makefile.am
-@@ -1,7 +1,7 @@
- AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
--	-DWORKDIR=\"$(abs_builddir)\"  -z muldefs
-+	-DWORKDIR=\"$(abs_builddir)\"
- 
--AM_LDFLAGS = -z muldefs
-+AM_LDFLAGS = -Wl,-z,muldefs
- 
- LIBS=@CHECK_LIBS@  $(top_builddir)/lib/libmc.la
- 
-diff --git a/tests/lib/vfs/Makefile.am b/tests/lib/vfs/Makefile.am
-index bf440ee..8c50d28 100644
---- a/tests/lib/vfs/Makefile.am
-+++ b/tests/lib/vfs/Makefile.am
-@@ -1,7 +1,7 @@
- AM_CFLAGS = -I$(top_srcdir)/lib/vfs $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@ \
--	-DTEST_SHARE_DIR=\"$(abs_srcdir)\" -z muldefs
-+	-DTEST_SHARE_DIR=\"$(abs_srcdir)\"
- 
--AM_LDFLAGS = -z muldefs
-+AM_LDFLAGS = -Wl,-z,muldefs
- 
- EXTRA_DIST = mc.charsets
- 
diff --git a/app-misc/mc/files/mc-4.8.8-race_cond_create_tmp_dir.patch b/app-misc/mc/files/mc-4.8.8-race_cond_create_tmp_dir.patch
new file mode 100644
index 000000000000..a4439447926e
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.8-race_cond_create_tmp_dir.patch
@@ -0,0 +1,37 @@
+Index: lib/vfs/interface.c
+===================================================================
+--- lib/vfs/interface.c	(revision 2640b21bb9700aa51a70f35f9e10732c82a7366f)
++++ lib/vfs/interface.c	(revision 33c47b5734771e54f10b2e3cf42cf2ae943b09c1)
+@@ -841,18 +841,18 @@
+     canonicalize_pathname (buffer);
+ 
+-    if (lstat (buffer, &st) == 0)
+-    {
+-        /* Sanity check for existing directory */
+-        if (!S_ISDIR (st.st_mode))
+-            error = _("%s is not a directory\n");
+-        else if (st.st_uid != getuid ())
+-            error = _("Directory %s is not owned by you\n");
+-        else if (((st.st_mode & 0777) != 0700) && (chmod (buffer, 0700) != 0))
+-            error = _("Cannot set correct permissions for directory %s\n");
+-    }
+-    else
+-    {
+-        /* Need to create directory */
+-        if (mkdir (buffer, S_IRWXU) != 0)
++    /* Try to create directory */
++    if (mkdir (buffer, S_IRWXU) != 0)
++    {
++        if (errno == EEXIST && lstat (buffer, &st) == 0)
++        {
++            /* Sanity check for existing directory */
++            if (!S_ISDIR (st.st_mode))
++                error = _("%s is not a directory\n");
++            else if (st.st_uid != getuid ())
++                error = _("Directory %s is not owned by you\n");
++            else if (((st.st_mode & 0777) != 0700) && (chmod (buffer, 0700) != 0))
++                error = _("Cannot set correct permissions for directory %s\n");
++        }
++        else
+         {
+             fprintf (stderr,
diff --git a/app-misc/mc/files/mc-4.8.8-wrong_char_in_menu_file.patch b/app-misc/mc/files/mc-4.8.8-wrong_char_in_menu_file.patch
new file mode 100644
index 000000000000..7eaac2bd35d9
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.8-wrong_char_in_menu_file.patch
@@ -0,0 +1,11 @@
+Index: misc/mc.menu
+===================================================================
+--- misc/mc.menu	(revision be2883dc86d01fa54003ec75b0a1fc9ed93c9358)
++++ misc/mc.menu	(revision a467bb4b6e2bec83dae4bbdd98ee529ffc45e4b1)
+@@ -66,5 +66,5 @@
+ = f \.c$ & t r
+ + f \.c$ & t r & ! t t
+-с       Compile and link current .c file
++c       Compile and link current .c file
+         make `basename %f .c` 2>/dev/null || cc -O -o `basename %f .c` %f
+ 
diff --git a/app-misc/mc/mc-4.8.1-r1.ebuild b/app-misc/mc/mc-4.8.1-r1.ebuild
deleted file mode 100644
index 81e1fe11bbbc..000000000000
--- a/app-misc/mc/mc-4.8.1-r1.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-r1.ebuild,v 1.13 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 ~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-muldefs.patch #403343
-	epatch "${FILESDIR}"/${PN}-4.8.1-muldefs-in.patch #403343
-	epatch "${FILESDIR}"/${PN}-4.8.1-fix-vfs-test.patch #403343
-}
-
-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 || 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.8.ebuild b/app-misc/mc/mc-4.8.8-r2.ebuild
index 802c67505506..40a8b85babfb 100644
--- a/app-misc/mc/mc-4.8.8.ebuild
+++ b/app-misc/mc/mc-4.8.8-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.8.ebuild,v 1.1 2013/04/03 18:37:29 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.8-r2.ebuild,v 1.1 2013/07/09 10:11:06 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils flag-o-matic
 
@@ -43,6 +43,13 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	# bug #473244
+	epatch "${FILESDIR}/${P}-segfault-unowned-temp-dir.patch"
+	# bug #403863
+	epatch "${FILESDIR}/${P}-race_cond_create_tmp_dir.patch"
+	# bug #461284
+	epatch "${FILESDIR}/${P}-wrong_char_in_menu_file.patch"
 }
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 0294d0089307..7ef18487b896 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.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-misc/mc/mc-9999.ebuild,v 1.11 2013/07/03 07:35:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-9999.ebuild,v 1.12 2013/07/09 10:11:06 polynomial-c Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 [[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
 
 src_prepare() {
-	epatch ${FILESDIR}/${PN}-4.8.9-unknown-opts.patch
+	epatch "${FILESDIR}/${PN}-4.8.9-unknown-opts.patch"
 
 	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
 }