Fix FEATURES=test on arm and alpha (bug #403343 by Markus Meier).

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

7 files changed, 309 insertions, 10 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index d6d662079d93..0cecdc7a3620 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.243 2012/02/11 19:54:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.244 2012/02/13 11:32:40 slyfox Exp $
+
+  13 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.1-fix-vfs-test.patch, +files/mc-4.8.1-muldefs-in.patch,
+  +files/mc-4.8.1-muldefs.patch, mc-4.8.1-r1.ebuild, mc-4.8.1-r2.ebuild:
+  Fix FEATURES=test on arm and alpha (bug #403343 by Markus Meier).
 
   11 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> mc-9999.ebuild:
   Upstream moved main tree to github leaving old one as read-only mirror.
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index f56672e92b33..b6f2d27a6200 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,6 +4,9 @@ Hash: SHA1
 AUX mc-4.8.0-fix-ftp-spaces.patch 1047 RMD160 8bfc6c0ffdcaded6a7f1382f0fee80d78fb928f0 SHA1 d6e1f843ce85a7351fd485cc6ec141ecd2a9c9fc SHA256 4285ba9907b4460739802876e39c8e2df858264214ef81ed8c2291b22f039515
 AUX mc-4.8.0-fix-nls.patch 949 RMD160 24627543ec6744b1b1d710a306dce4d5782e360e SHA1 d70b0ec63f65b72e414efcac2cc04e75740848d1 SHA256 504856248f6c3ab21870c7555f31cdcd9ac509c883ab6cc2929440fb9d1e2216
 AUX mc-4.8.1-fix-fallocate-xBSD.patch 944 RMD160 0ec606fcbc4ea4e26f96e413bfc373a6cb6289f4 SHA1 92ecfa2169f2dc386ea77d2261fda09fd962fb38 SHA256 aa64c6187b18a52944837bb22c660ae56a2b11877d20a045c5cca0d875e61d05
+AUX mc-4.8.1-fix-vfs-test.patch 5593 RMD160 02fabee27661f3479c923d5ace68ebbca55c413b SHA1 eb70e90e5a4e9effde86489a1f33d7aba7096ce8 SHA256 1595a4065b3ff76a11e01b84fd3a7f552373ab00b305de32ab62ed6ebd3f7dd4
+AUX mc-4.8.1-muldefs-in.patch 1963 RMD160 d7093acee4c1d84843c04512f088d4fd8aba7c10 SHA1 9c5dd2fb501df72526559720be215dbadd5a7eb8 SHA256 232f2f0bd12c666a2bee4510a5ac8d15e7cfcc197ffbea12352eda42651fc7bf
+AUX mc-4.8.1-muldefs.patch 1534 RMD160 05f5aca41cac9db155bcad344d22d68c189c42a2 SHA1 9f6e160af4837e0f8c006331bce219829dcf1799 SHA256 6c08488a3047101465066c7513e384e4d4e7a211e64f9e17fe4236f4a66705de
 DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
 DIST mc-4.7.5.2.tar.lzma 1943321 RMD160 8477450d0f2cddc356d93c5006fcfd278966f863 SHA1 fb44d01a80c5e4589aece205adccff5b5a5c34c1 SHA256 ca362c629ea984b635e38e0912ec3a7ceb44facc18f0c17c17d6a114c14e7c26
@@ -13,15 +16,15 @@ EBUILD mc-4.7.0.10.ebuild 1920 RMD160 8f3ef7092e656e806c7252fdd54f5e8c066316fc S
 EBUILD mc-4.7.0.3.ebuild 1706 RMD160 47509be466b4c9cb659cbaee63ac3f4919802b30 SHA1 7e81b7de80a5b28b9f458a25f9c7f4e932a2a155 SHA256 5108770f4b2d507a912a0ec5669dd6d23512afd0b70eadfcc10f7359513f9dbf
 EBUILD mc-4.7.5.2.ebuild 1950 RMD160 1ca9e3bda31808ca7ef6134f4dc0bd1f960dce16 SHA1 bf5bb81a103d5d26f3277020ac474ca278a02779 SHA256 43dead96569eba118d74d4eee7955c291c2e6e07bebed3de7cd146a2fa2a70f5
 EBUILD mc-4.7.5.6-r1.ebuild 2045 RMD160 270e8616950482b443dc4d0d982353511084f871 SHA1 fbd907cfc5a57cc2fb1d9af779f35d369f0c3790 SHA256 93b5a58fb99313f7c395c5b049cf26bfd56a42aedac7bbcdbf0d5d0eddb8edcd
-EBUILD mc-4.8.1-r1.ebuild 2215 RMD160 2addb550016732854bb5155af794cabd3c1328fc SHA1 22201f5cc818a077fbdba57f7e103e8497f30e26 SHA256 fad8c4af023a402165c113736cdb3c4cdf01f40f06dbc5e3746d619dfd8bfe38
-EBUILD mc-4.8.1-r2.ebuild 2250 RMD160 d430d00732aa2dd0d97c1f13449b9739bdb6b338 SHA1 9d38021dbf9f69c5b884c1cceb41c5e51654cfe3 SHA256 671f48975b0281702700d4c1df1583132a2a20552d5378bcf468a23701d81df7
+EBUILD mc-4.8.1-r1.ebuild 2412 RMD160 8a08c54fa78379492feeaed92336eb2dd6977fa9 SHA1 30c751f64877265be87dbea75db55b7d80cf14a6 SHA256 fca3d0057bb410d27e3b8b5957c45c1197efecae29e0bc11d9d619ce06a8d32a
+EBUILD mc-4.8.1-r2.ebuild 2367 RMD160 8ef9c92e9eb37289bbcf82c00291fb2633567cd6 SHA1 69f005824abd578dd8354ba2a785414eff1e2f4e SHA256 7328db03cfaf7e45213a611b7e7b48236a028cadc4c44f58c0d57da9b1d40947
 EBUILD mc-9999.ebuild 2864 RMD160 caee418ddbefc1e7d469137eb5758aae720fe5d7 SHA1 3c426634a1168cc8f6f1b607068181ac270963f3 SHA256 97e3bf45fd98f7c62faa0248203711c4993077a2df911f83fdd5956c02197d7b
-MISC ChangeLog 34854 RMD160 36d52085be483c9dbc576b7ea945d368744c5223 SHA1 b84ea27def660b5368a33c12272c7599a02b28be SHA256 2ac09f3cea1345827933c1e2e4adbe460f9ce7b6e7881d6bb73a183512d23f5d
+MISC ChangeLog 35122 RMD160 c5ef32ef2be2c7c94c70e8fff87265964284eb26 SHA1 de68ac6f0e7aba362c531bdcaab4b6842097f327 SHA256 c357976f8337e7b070e3e907bc9b47f95909938a1ccba2cc7f6946c6f0770fda
 MISC metadata.xml 653 RMD160 5c0932709a9e11cef3ac4c95c88b906f688681c5 SHA1 bc2b471e4c49117bccb3dd2b1f9ec00cb24ca5da SHA256 760d390ffdbec152f1220dd02edc067a10243c4f936eed416b52d46a955dd683
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk82yIgACgkQcaHudmEf86roNgCcDRlVG8/1uPqD+n2toakTk3wr
-nykAnAt3+D31rRCk/LPmNnn7l67D8hnH
-=KOhS
+iEYEARECAAYFAk849e8ACgkQcaHudmEf86pHDgCeKuJu1pnzk5iauom+6ISxmqwo
+dCwAmwRAwT23SkUpQ8KJbzPg6lEypi6v
+=aqyP
 -----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
new file mode 100644
index 000000000000..f3a7c047c6b8
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.1-fix-vfs-test.patch
@@ -0,0 +1,184 @@
+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
new file mode 100644
index 000000000000..2f0a9068dbcc
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.1-muldefs-in.patch
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 000000000000..2155391a2b31
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.1-muldefs.patch
@@ -0,0 +1,45 @@
+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/mc-4.8.1-r1.ebuild b/app-misc/mc/mc-4.8.1-r1.ebuild
index 9f95caeca062..708985a40318 100644
--- a/app-misc/mc/mc-4.8.1-r1.ebuild
+++ b/app-misc/mc/mc-4.8.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r1.ebuild,v 1.7 2012/02/01 17:24:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r1.ebuild,v 1.8 2012/02/13 11:32:40 slyfox Exp $
 
 EAPI=4
 
-inherit base flag-o-matic
+inherit eutils flag-o-matic
 
 MY_P=${P/_/-}
 
@@ -39,6 +39,12 @@ DEPEND="${RDEPEND}
 
 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
diff --git a/app-misc/mc/mc-4.8.1-r2.ebuild b/app-misc/mc/mc-4.8.1-r2.ebuild
index 527d0b10a6f4..951a86a75aab 100644
--- a/app-misc/mc/mc-4.8.1-r2.ebuild
+++ b/app-misc/mc/mc-4.8.1-r2.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.1-r2.ebuild,v 1.1 2012/01/27 20:26:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r2.ebuild,v 1.2 2012/02/13 11:32:40 slyfox Exp $
 
 EAPI=4
 
@@ -41,6 +41,8 @@ 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