old

(Portage version: 2.2_rc44/cvs/Linux x86_64)

15 files changed, 8 insertions, 821 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 27a65e1f3326..5b21abe7263f 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,25 +1,9 @@
-AUX chdir-4.6.0.gentoo 159 RMD160 5edd511a40033bc11ed6e486edcce5b23c8305a2 SHA1 f9d22b48903f1f5c7f3ae885c6949c65827583b5 SHA256 92fbe981eda972767866b388548c1837dcc32b06549b2dcf3c44d8bfe62d398f
-AUX ebuild.syntax 3336 RMD160 b707506b2df102bee2031791847f4aa3a067aca7 SHA1 ef2a55bd1381d816e09c48798a803db38444acb8 SHA256 6bf215349535902e65e71dc7a8acbb5dd53e87f068e1a12b604d0d56cb36bbb1
-AUX mc-4.6.0-7zip.patch 631 RMD160 aee1d87da11c95e18e189874832b97e43521e8e0 SHA1 b8376620d0201963c8595b5ffad4cc631182b2d7 SHA256 371801acda66eed1c2a334385b1dc3854f3d864282aa58650c4fb46d615a93d7
-AUX mc-4.6.0-ebuild-syntax.patch 296 RMD160 adc93b215cb7d092226a8a6dc6d7eb1114d031fc SHA1 e6e7d073a533f6020ef72efea22c91cd6d7a42eb SHA256 18787cc1605326aea8e71573780c02992e31404bde79b02b63ca1d2bb14a5aef
-AUX mc-4.6.1-bash-all.patch 924 RMD160 647b45835dbe3aa879ed333ea42e346c4bbc73eb SHA1 21607d94762c25d16ed402a6841955b69d8819e9 SHA256 0fc6eb34fd885c737913de18dc0b0460a471f938189fdb5ede46e1d068dc7b04
-AUX mc-4.6.1-charset-locale-aliases.patch 1529 RMD160 2adaa973e9d021ca79c3d3a1693b296635a2a0ac SHA1 1446e749c6c2b372f3c4f966b1fa13dc67619adc SHA256 fce9179fe4481104448779d51602b593b15d45f56825fce43b4c85c1194c743e
-AUX mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 SHA1 7611f81a9f69ba3e62931f73fa0bfd56a5706e10 SHA256 70afc16da05d7d10bc1965039090546856692ed6013acf51b2a9d9ca85ed6868
-AUX mc-4.6.1-invalid-mtime.patch 787 RMD160 fb02c6c2c672780551a79d942cd7b3be8eb96c1c SHA1 4ef7584019cc5e7632c2a687705d4b2bd7ba457e SHA256 e6cd8c235aed5362538689daf2a92eddb36e2c79387e26c78d8ac71210224520
-AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca SHA1 1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64 SHA256 005bbc46f6b4ee3ff8ce29cf1b8974af69e38b4ca5676512927a3a8cd290ee57
-AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd SHA1 34b3e6d4807c9e055dbafeede0ed3aa74efe7224 SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e
 AUX mc-4.7.0_pre1-ebuild_syntax.patch 1352 RMD160 603d62336c00e85712bfbef03218340f27b00074 SHA1 777a58895a67c6c11b6530129eb13ea5a9647eb0 SHA256 0cdc301345fb324df90827fb0c3e32f144a5babb19cd8b1d5ac673d47b0b8e10
 AUX mc-4.7.0_pre1-tbz2_filetype.patch 564 RMD160 c039c1b8c61c4757b73e61fa5baae5bf9eca2542 SHA1 2db984784143e508348d22d1cb53ed27b83f5e24 SHA256 cfe64f0ed7e7388398c5313026dc432585f6fb386e4be6bd7ec8f881cdedb06c
 AUX mc-4.7.0_pre1-undelfs_configure.patch 757 RMD160 5f5b65c7d5cde6bff56a8cae0e1725c31dc064a2 SHA1 1ce39e2b7ff2a499d8de0ba85fcd346e9518fba0 SHA256 9dbbf46d6dcf694cd2d831ffb127a15d0f39c866ff5e16e6fa4d3fae9be4b5fc
-AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9
-AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1
-DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e
-DIST mc-4.6.1.tar.gz 3928370 RMD160 d565ee95a8916d73fad5e0defeb9f2f57e50962b SHA1 92be0802143245e0fb7e3847d70da614cad7d5fb SHA256 086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e
 DIST mc-4.7.0-pre1.tar.bz2 2783935 RMD160 0f63d2a3b30af097697ae5fb715bb04249877e9b SHA1 028dcdc998f012445cb9a3c707f9411bbe46ac65 SHA256 a774ff52ef9ba4654e3bf48081f4775ad90fb4d86f1670d6a3a6804d090213ef
 DIST mc-4.7.0-pre3.tar.bz2 2815368 RMD160 301a961bc7a5305f72de5fa85e730d36883a367d SHA1 2c67b231e29f6d1c410e7da51bb49cf84eeb83d9 SHA256 267ba6546665da7eae5d25b7b6ea5800f527027c45497d20385b5c218f170e88
-DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
-EBUILD mc-4.6.1-r4.ebuild 4435 RMD160 3fb4884c84cea9ebc1d25712c5cfd82f4cd32a83 SHA1 8299104edf60b0b62ba8b565a88c003029f0c6b2 SHA256 92a93a2dbf14c086a9a0684f813a7d7b05e58835ba1969bae4b7f8f94aa3f315
 EBUILD mc-4.7.0_pre1.ebuild 1835 RMD160 7fa9513ba182d4de48cab7d5bb7a4805c039ba75 SHA1 ece87c92709d128e515ca6d676ddb4003f9b998b SHA256 fd4f9e22a52c13cc8af7126e1326755a8b402b4358138454b2cbd48c379a4065
 EBUILD mc-4.7.0_pre3.ebuild 1585 RMD160 08fd4e21d5187c17793cd6f1c414368b24ab73ad SHA1 d5675fb461aa90b0b96e672f00b352352f5571d2 SHA256 c9170b1a8fcc79d420d52fb2d6c2aa1a1f82b0a7e22ee715ae9c9b345330eac0
 MISC ChangeLog 24236 RMD160 fa8a42c6500128af1952a753847ab75f5ab1a36e SHA1 d5dc38a9f461ee9011d8780c761ef0ea3c2af04e SHA256 7826da884b3e90f6f2041f40be85b4f6ec808e043ca0612793b5d9668c4f997b
-MISC metadata.xml 348 RMD160 f716b191c6095be88e987dd860a7fd0c397dd179 SHA1 9737dd89ded0bb0fb3434307d368b8438c332272 SHA256 f49fbc1d96f58052599d5acbdf8cb9cf965db9b40e97ffdd2c4bd41dcb054550
+MISC metadata.xml 305 RMD160 319f6d3a222a3028d69dfb5ece59f4ae0343125a SHA1 705291c975a8b25ccc5a040d4fa7feab9190048e SHA256 e8245261e4eaebac2b2f5017c36165f9e733bc1e3619392b8f64c0d5392e7cd9
diff --git a/app-misc/mc/files/chdir-4.6.0.gentoo b/app-misc/mc/files/chdir-4.6.0.gentoo
deleted file mode 100644
index 9332ba0ee061..000000000000
--- a/app-misc/mc/files/chdir-4.6.0.gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-
-MC ()
-{
-	mkdir -p $HOME/.mc/tmp 2> /dev/null
-	chmod 700 $HOME/.mc/tmp
-	MC=$HOME/.mc/tmp/mc-$$
-	/usr/bin/mc -P "$MC"
-	cd "`cat $MC`"
-	rm -f "$MC"
-	unset MC;
-}
diff --git a/app-misc/mc/files/ebuild.syntax b/app-misc/mc/files/ebuild.syntax
deleted file mode 100644
index abaa4577ee23..000000000000
--- a/app-misc/mc/files/ebuild.syntax
+++ /dev/null
@@ -1,107 +0,0 @@
-context default
-    keyword linestart DEPEND brightcyan
-    keyword linestart DESCRIPTION brightcyan
-    keyword linestart EAPI brightcyan
-    keyword linestart HOMEPAGE brightcyan
-    keyword linestart IUSE brightcyan
-    keyword linestart KEYWORDS brightcyan
-    keyword linestart LICENSE brightcyan
-    keyword linestart PDEPEND brightcyan
-    keyword linestart PROVIDE brightcyan
-    keyword linestart RDEPEND brightcyan
-    keyword linestart RESTRICT brightcyan
-    keyword linestart S brightcyan
-    keyword linestart SLOT brightcyan
-    keyword linestart SRC_URI brightcyan
-    keyword linestart WANT_AUTOCONF brightcyan
-    keyword linestart WANT_AUTOMAKE brightcyan
-
-    keyword whole _elibtoolize yellow
-    keyword whole check_KV yellow
-    keyword whole best_version yellow
-    keyword whole built_with_use yellow
-    keyword whole die yellow
-    keyword whole diropts yellow
-    keyword whole dobin yellow
-    keyword whole docinto yellow
-    keyword whole doconfd yellow
-    keyword whole dodir yellow
-    keyword whole dodoc yellow
-    keyword whole doenvd yellow
-    keyword whole doexe yellow
-    keyword whole dohard yellow
-    keyword whole dohtml yellow
-    keyword whole doicon yellow
-    keyword whole doinfo yellow
-    keyword whole doinitd yellow
-    keyword whole doins yellow
-    keyword whole dolib yellow
-    keyword whole dolib.a yellow
-    keyword whole dolib.so yellow
-    keyword whole doman yellow
-    keyword whole domenu yellow
-    keyword whole dosbin yellow
-    keyword whole dosed yellow
-    keyword whole dosym yellow
-    keyword whole eautoconf yellow
-    keyword whole eautoreconf yellow
-    keyword whole eautomake yellow
-    keyword whole ebegin yellow
-    keyword whole econf yellow
-    keyword whole eend yellow
-    keyword whole eerror yellow
-    keyword whole einfo yellow
-    keyword whole einstall yellow
-    keyword whole elibtoolize yellow    
-    keyword whole elog yellow
-    keyword whole emake yellow
-    keyword whole epatch yellow
-    keyword whole ewarn yellow
-    keyword whole exeinto yellow
-    keyword whole exeopts yellow
-    keyword whole fowners yellow
-    keyword whole fperms yellow
-    keyword whole has yellow
-    keyword whole hasq yellow
-    keyword whole has_version yellow
-    keyword whole insinto yellow
-    keyword whole insopts yellow
-    keyword whole into yellow
-    keyword whole keepdir yellow
-    keyword whole libopts yellow
-    keyword whole local yellow
-    keyword whole newbin yellow
-    keyword whole newconfd yellow
-    keyword whole newdoc yellow
-    keyword whole newexe yellow
-    keyword whole newins yellow
-    keyword whole newman yellow
-    keyword whole newsbin yellow
-    keyword whole newinitd yellow
-    keyword whole prepall yellow
-    keyword whole prepalldocs yellow
-    keyword whole prepallinfo yellow
-    keyword whole prepallman yellow
-    keyword whole unpack yellow
-    keyword whole use yellow
-    keyword whole use_enable yellow
-    keyword whole use_with yellow
-
-    keyword = yellow
-    keyword : yellow
-    keyword ${+} brightgreen
-
-    keyword linestart abcdefghijklmnopqrstuvwxyz_\(\) brightmagenta
-
-    keyword *() brightcyan
-
-    keyword { magenta
-    keyword } magenta
-
-context linestart inherit \n magenta
-    keyword whole inherit yellow
-
-context # \n red
-
-context " " green
-    keyword wholeright ${+} brightgreen
diff --git a/app-misc/mc/files/mc-4.6.0-7zip.patch b/app-misc/mc/files/mc-4.6.0-7zip.patch
deleted file mode 100644
index 29cda12f8532..000000000000
--- a/app-misc/mc/files/mc-4.6.0-7zip.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- lib/mc.ext.in.old	2003-01-30 17:48:33.000000000 +0200
-+++ lib/mc.ext.in	2004-11-08 16:51:59.429212632 +0200
-@@ -143,6 +143,12 @@
- shell/.info
- 	Open=info -f %f
- 
-+# 7-Zip, Needs to be before manual page definitions
-+regex/\.(7z|7Z)$
-+	View=%view{ascii} 7za l %f 2>/dev/null
-+	Open=%cd %p#u7z
-+
-+
- # Manual page
- # Exception - .so libraries are not manual pages
- regex/\.(so|so\.[0-9\.]*)$
---- vfs/extfs/extfs.ini.old	2002-12-09 16:16:33.000000000 +0200
-+++ vfs/extfs/extfs.ini	2004-10-25 13:56:04.000000000 +0300
-@@ -7,6 +7,7 @@
- ulha
- urar
- uha
-+u7z
- # For arj usage you need a special patch to unarj (see unarj.diff)
- uarj
- 
diff --git a/app-misc/mc/files/mc-4.6.0-ebuild-syntax.patch b/app-misc/mc/files/mc-4.6.0-ebuild-syntax.patch
deleted file mode 100644
index ce59dd33e808..000000000000
--- a/app-misc/mc/files/mc-4.6.0-ebuild-syntax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Syntax	2004-08-20 22:52:37.145034864 +0200
-+++ Syntax.new	2004-08-20 22:52:19.000000000 +0200
-@@ -116,6 +116,9 @@
- file Don_t_match_me Mail\sfolder ^From\s
- include mail.syntax
- 
-+file .\*\\.(ebuild|eclass)$ Gentoo\sEbuild
-+include ebuild.syntax
-+
- file .\* unknown
- include unknown.syntax
- 
diff --git a/app-misc/mc/files/mc-4.6.1-bash-all.patch b/app-misc/mc/files/mc-4.6.1-bash-all.patch
deleted file mode 100644
index d16128108d77..000000000000
--- a/app-misc/mc/files/mc-4.6.1-bash-all.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/subshell.c	2006-05-08 23:11:48.000000000 +0200
-+++ b/src/subshell.c	2006-10-28 15:40:46.000000000 +0200
-@@ -745,29 +745,13 @@ subshell_name_quote (const char *s)
-     memcpy (d, cmd_start, len);
-     d += len;
- 
--    /*
--     * Print every character in octal format with the leading backslash.
--     * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
--     */
--    if (subshell_type == BASH) {
- 	for (; *s; s++) {
--	    /* Must quote numbers, so that they are not glued to octals */
- 	    if (isalpha ((unsigned char) *s)) {
- 		*d++ = (unsigned char) *s;
- 	    } else {
--		sprintf (d, "\\%03o", (unsigned char) *s);
--		d += 4;
--	    }
--	}
--    } else {
--	for (; *s; s++) {
--	    if (isalnum ((unsigned char) *s)) {
--		*d++ = (unsigned char) *s;
--	    } else {
- 		sprintf (d, "\\0%03o", (unsigned char) *s);
- 		d += 5;
- 	    }
--	}
-     }
- 
-     memcpy (d, common_end, sizeof (common_end));
-
diff --git a/app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch b/app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch
deleted file mode 100644
index 53aedd0d4a99..000000000000
--- a/app-misc/mc/files/mc-4.6.1-charset-locale-aliases.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ruN mc-4.6.1.orig/intl/Makefile.in mc-4.6.1/intl/Makefile.in
---- mc-4.6.1.orig/intl/Makefile.in	2007-03-06 22:31:02.000000000 +0300
-+++ mc-4.6.1/intl/Makefile.in	2007-03-06 22:38:52.000000000 +0300
-@@ -156,12 +156,7 @@
- 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
- 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
- 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
--	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
--	    orig=$(DESTDIR)$(libdir)/charset.alias; \
--	    sed -f ref-add.sed $$orig > $$temp; \
--	    $(INSTALL_DATA) $$temp $$dest; \
--	    rm -f $$temp; \
--	  else \
-+	  if ! test -f $(libdir)/charset.alias; then \
- 	    if test @GLIBC21@ = no; then \
- 	      orig=charset.alias; \
- 	      sed -f ref-add.sed $$orig > $$temp; \
-@@ -170,14 +165,14 @@
- 	    fi; \
- 	  fi; \
- 	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
--	  test -f $(DESTDIR)$(localedir)/locale.alias \
--	    && orig=$(DESTDIR)$(localedir)/locale.alias \
--	    || orig=$(srcdir)/locale.alias; \
--	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
--	  dest=$(DESTDIR)$(localedir)/locale.alias; \
--	  sed -f ref-add.sed $$orig > $$temp; \
--	  $(INSTALL_DATA) $$temp $$dest; \
--	  rm -f $$temp; \
-+	  if ! test -f $(localedir)/locale.alias; then \
-+	    orig=$(srcdir)/locale.alias; \
-+	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-+	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-+	    sed -f ref-add.sed $$orig > $$temp; \
-+	    $(INSTALL_DATA) $$temp $$dest; \
-+	    rm -f $$temp; \
-+	  fi; \
- 	else \
- 	  : ; \
- 	fi
diff --git a/app-misc/mc/files/mc-4.6.1-find.patch b/app-misc/mc/files/mc-4.6.1-find.patch
deleted file mode 100644
index f44a6ac630e8..000000000000
--- a/app-misc/mc/files/mc-4.6.1-find.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Naur mc-4.6.1.orig/src/cmd.c mc-4.6.1/src/cmd.c
---- mc-4.6.1.orig/src/cmd.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/cmd.c	2006-03-19 12:57:00.000000000 +0100
-@@ -510,7 +510,7 @@
- 		continue;
- 	}
- 	c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
--			  match_file);
-+			  match_file, 0);
- 	if (c == -1) {
- 	    message (1, MSG_ERROR, _("  Malformed regular expression  "));
- 	    g_free (reg_exp);
-diff -Naur mc-4.6.1.orig/src/dir.c mc-4.6.1/src/dir.c
---- mc-4.6.1.orig/src/dir.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/dir.c	2006-03-19 12:58:56.000000000 +0100
-@@ -405,7 +405,7 @@
- 	    *stale_link = 1;
-     }
-     if (!(S_ISDIR (buf1->st_mode) || *link_to_dir) && filter
--	&& !regexp_match (filter, dp->d_name, match_file))
-+	&& !regexp_match (filter, dp->d_name, match_file, 0))
- 	return 0;
- 
-     /* Need to grow the *list? */
-diff -Naur mc-4.6.1.orig/src/ext.c mc-4.6.1/src/ext.c
---- mc-4.6.1.orig/src/ext.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/ext.c	2006-03-19 13:00:43.000000000 +0100
-@@ -394,7 +394,7 @@
-     }
- 
-     if (content_string[0]
--	&& regexp_match (ptr, content_string + content_shift, match_regex)) {
-+	&& regexp_match (ptr, content_string + content_shift, match_regex, 0)) {
- 	found = 1;
-     }
- 
-@@ -534,11 +534,11 @@
- 		/* Do not transform shell patterns, you can use shell/ for
- 		 * that
- 		 */
--		if (regexp_match (p, filename, match_regex))
-+		if (regexp_match (p, filename, match_regex, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "directory/", 10)) {
- 		if (S_ISDIR (mystat.st_mode)
--		    && regexp_match (p + 10, filename, match_regex))
-+		    && regexp_match (p + 10, filename, match_regex, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "shell/", 6)) {
- 		p += 6;
-diff -Naur mc-4.6.1.orig/src/find.c mc-4.6.1/src/find.c
---- mc-4.6.1.orig/src/find.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/find.c	2006-03-19 13:04:10.000000000 +0100
-@@ -575,6 +575,7 @@
-     struct stat tmp_stat;
-     static int pos;
-     static int subdirs_left = 0;
-+    int flags = 0;
- 
-     if (!h) { /* someone forces me to close dirp */
- 	if (dirp) {
-@@ -586,6 +587,10 @@
-         dp = 0;
- 	return 1;
-     }
-+    
-+    if (!(case_sense->state & C_BOOL))
-+	flags |= REG_ICASE;
-+	
-  do_search_begin:
-     while (!dp){
- 	
-@@ -662,7 +667,7 @@
- 	g_free (tmp_name);
-     }
- 
--    if (regexp_match (find_pattern, dp->d_name, match_file)){
-+    if (regexp_match (find_pattern, dp->d_name, match_file, flags)){
- 	if (content_pattern) {
- 	    if (search_content (h, directory, dp->d_name)) {
- 		return 1;
-diff -Naur mc-4.6.1.orig/src/user.c mc-4.6.1/src/user.c
---- mc-4.6.1.orig/src/user.c	2005-07-01 17:47:07.000000000 +0200
-+++ mc-4.6.1/src/user.c	2006-03-19 13:05:00.000000000 +0100
-@@ -412,18 +412,18 @@
- 	    break;
- 	case 'f': /* file name pattern */
- 	    p = extract_arg (p, arg, sizeof (arg));
--	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file);
-+	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file, 0);
- 	    break;
- 	case 'y': /* syntax pattern */
-             if (edit_widget && edit_widget->syntax_type) {
- 	        p = extract_arg (p, arg, sizeof (arg));
- 	        *condition = panel &&
--                    regexp_match (arg, edit_widget->syntax_type, match_normal);
-+                    regexp_match (arg, edit_widget->syntax_type, match_normal, 0);
- 	    }
-             break;
- 	case 'd':
- 	    p = extract_arg (p, arg, sizeof (arg));
--	    *condition = panel && regexp_match (arg, panel->cwd, match_file);
-+	    *condition = panel && regexp_match (arg, panel->cwd, match_file, 0);
- 	    break;
- 	case 't':
- 	    p = extract_arg (p, arg, sizeof (arg));
-diff -Naur mc-4.6.1.orig/src/util.c mc-4.6.1/src/util.c
---- mc-4.6.1.orig/src/util.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/util.c	2006-03-19 13:06:58.000000000 +0100
-@@ -563,27 +563,30 @@
- 	return  g_strdup (pattern);
- }
- 
--int regexp_match (const char *pattern, const char *string, int match_type)
-+int regexp_match (const char *pattern, const char *string, int match_type, int flags)
- {
-     static regex_t r;
-     static char *old_pattern = NULL;
-     static int old_type;
-+    static int old_flags;
-     int    rval;
-     char *my_pattern;
- 
--    if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type != match_type){
-+    if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type != match_type || old_flags != flags){
- 	if (old_pattern){
- 	    regfree (&r);
- 	    g_free (old_pattern);
- 	    old_pattern = NULL;
- 	}
- 	my_pattern = convert_pattern (pattern, match_type, 0);
--	if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS)) {
-+	
-+	if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS|flags)) {
- 	    g_free (my_pattern);
- 	    return -1;
- 	}
- 	old_pattern = my_pattern;
- 	old_type = match_type;
-+	old_flags = flags;
-     }
-     rval = !regexec (&r, string, 0, NULL, 0);
-     return rval;
-diff -Naur mc-4.6.1.orig/src/util.h mc-4.6.1/src/util.h
---- mc-4.6.1.orig/src/util.h	2005-01-13 20:20:47.000000000 +0100
-+++ mc-4.6.1/src/util.h	2006-03-19 13:07:16.000000000 +0100
-@@ -116,7 +116,7 @@
- 
- extern int easy_patterns;
- char *convert_pattern (const char *pattern, int match_type, int do_group);
--int regexp_match (const char *pattern, const char *string, int match_type);
-+int regexp_match (const char *pattern, const char *string, int match_type, int flags);
- 
- /* Error pipes */
- void open_error_pipe (void);
diff --git a/app-misc/mc/files/mc-4.6.1-invalid-mtime.patch b/app-misc/mc/files/mc-4.6.1-invalid-mtime.patch
deleted file mode 100644
index 07b1f6d1c169..000000000000
--- a/app-misc/mc/files/mc-4.6.1-invalid-mtime.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-  Invalid timestamps on files caused mc to segfault by passing a null
-  pointer to strftime. Avoid trying to print the time in this case.
-
-  Reported by Maxim Britov <maxim@office.modum.by>
-  at http://bugs.gentoo.org/184296
-
---- mc-4.6.1/src/util.c
-+++ mc-4.6.1/src/util.c
-@@ -717,6 +717,7 @@
-     static size_t i18n_timelength = 0;
-     static const char *fmtyear, *fmttime;
-     const char *fmt;
-+    struct tm *whentm;
- 
-     if (i18n_timelength == 0){
- 	i18n_timelength = i18n_checktimelength() + 1;
-@@ -740,7 +741,11 @@
-     else
- 	fmt = fmttime;
-     
--    strftime (timebuf, i18n_timelength, fmt, localtime(&when));
-+    whentm = localtime(&when);
-+    if (whentm == NULL)
-+	return "(invalid)";
-+
-+    strftime (timebuf, i18n_timelength, fmt, whentm);
-     return timebuf;
- }
- 
diff --git a/app-misc/mc/files/mc-4.6.1-largefile.patch b/app-misc/mc/files/mc-4.6.1-largefile.patch
deleted file mode 100644
index de3071576a71..000000000000
--- a/app-misc/mc/files/mc-4.6.1-largefile.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -Naur mc-4.6.1.orig/intl/loadmsgcat.c mc-4.6.1/intl/loadmsgcat.c
---- mc-4.6.1.orig/intl/loadmsgcat.c	2005-07-23 18:52:57.000000000 +0200
-+++ mc-4.6.1/intl/loadmsgcat.c	2006-03-19 17:11:14.000000000 +0100
-@@ -1002,7 +1002,7 @@
-       /* The magic number is wrong: not a message catalog file.  */
- #ifdef HAVE_MMAP
-       if (use_mmap)
--	munmap ((caddr_t) data, size);
-+	munmap ((void *) data, size);
-       else
- #endif
- 	free (data);
-@@ -1271,7 +1271,7 @@
- 	free (domain->malloced);
- #ifdef HAVE_MMAP
-       if (use_mmap)
--	munmap ((caddr_t) data, size);
-+	munmap ((void *) data, size);
-       else
- #endif
- 	free (data);
-@@ -1306,7 +1306,7 @@
- 
- # ifdef _POSIX_MAPPED_FILES
-   if (domain->use_mmap)
--    munmap ((caddr_t) domain->data, domain->mmap_size);
-+    munmap ((void *) domain->data, domain->mmap_size);
-   else
- # endif	/* _POSIX_MAPPED_FILES */
-     free ((void *) domain->data);
-diff -Naur mc-4.6.1.orig/src/view.c mc-4.6.1/src/view.c
---- mc-4.6.1.orig/src/view.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/view.c	2006-03-19 17:10:34.000000000 +0100
-@@ -76,6 +76,12 @@
- #define vwidth (view->widget.cols - (view->have_frame ? 2 : 0))
- #define vheight (view->widget.lines - (view->have_frame ? 2 : 0))
- 
-+#if GLIB_MAJOR_VERSION >= 2
-+#  define my_g_malloc g_try_malloc
-+#else
-+#  define my_g_malloc g_malloc
-+#endif
-+
- /* Offset in bytes into a file */
- typedef unsigned long offset_type;
- #define INVALID_OFFSET ((offset_type) -1)
-@@ -560,8 +566,8 @@
- 	view->data = mc_mmap (0, view->s.st_size, PROT_READ,
- 			      MAP_FILE | MAP_SHARED, view->file, 0);
-     else
--	view->data = (caddr_t) -1;
--    if ((caddr_t) view->data != (caddr_t) - 1) {
-+	view->data = (void *) -1;
-+    if (view->data != (void *)-1) {
- 	/* mmap worked */
- 	view->first = 0;
- 	view->bytes_read = view->s.st_size;
-@@ -573,6 +579,9 @@
-     /* For the OSes that don't provide mmap call, try to load all the
-      * file into memory (alex@bcs.zaporizhzhe.ua).  Also, mmap can fail
-      * for any reason, so we use this as fallback (pavel@ucw.cz) */
-+     
-+    /* If large file support is enabled, st_size is a 64 bit value and
-+     * will thus on 32 bit platforms possibly be beyond the range of gulong */
- 
-     /* Make sure view->s.st_size is not truncated when passed to g_malloc */
-     if ((gulong) view->s.st_size == view->s.st_size)
-diff -Naur mc-4.6.1.orig/vfs/local.c mc-4.6.1/vfs/local.c
---- mc-4.6.1.orig/vfs/local.c	2004-09-25 01:00:18.000000000 +0200
-+++ mc-4.6.1/vfs/local.c	2006-03-19 17:00:45.000000000 +0100
-@@ -243,8 +243,8 @@
- }
- 
- #ifdef HAVE_MMAP
--caddr_t
--local_mmap (struct vfs_class *me, caddr_t addr, size_t len, int prot, int flags, void *data, off_t offset)
-+void *
-+local_mmap (struct vfs_class *me, void *addr, size_t len, int prot, int flags, void *data, off_t offset)
- {
-     int fd = * (int *)data;
- 
-@@ -252,7 +252,7 @@
- }
- 
- int
--local_munmap (struct vfs_class *me, caddr_t addr, size_t len, void *data)
-+local_munmap (struct vfs_class *me, void *addr, size_t len, void *data)
- {
-     return munmap (addr, len);
- }
-diff -Naur mc-4.6.1.orig/vfs/local.h mc-4.6.1/vfs/local.h
---- mc-4.6.1.orig/vfs/local.h	2004-08-17 11:17:43.000000000 +0200
-+++ mc-4.6.1/vfs/local.h	2006-03-19 17:01:35.000000000 +0100
-@@ -13,9 +13,9 @@
- extern int local_errno (struct vfs_class *me);
- extern int local_lseek (void *data, off_t offset, int whence);
- #ifdef HAVE_MMAP
--extern caddr_t local_mmap (struct vfs_class *me, caddr_t addr, size_t len,
-+extern void *local_mmap (struct vfs_class *me, void *addr, size_t len,
-                            int prot, int flags, void *data, off_t offset);
--extern int local_munmap (struct vfs_class *me, caddr_t addr, size_t len, void *data);
-+extern int local_munmap (struct vfs_class *me, void *addr, size_t len, void *data);
- #endif
- 
- #endif
-diff -Naur mc-4.6.1.orig/vfs/samba/lib/util.c mc-4.6.1/vfs/samba/lib/util.c
---- mc-4.6.1.orig/vfs/samba/lib/util.c	2005-05-27 16:19:19.000000000 +0200
-+++ mc-4.6.1/vfs/samba/lib/util.c	2006-03-19 17:06:39.000000000 +0100
-@@ -1836,7 +1836,7 @@
- 	
-   /* Look up the host address in the address list we just got. */
-   for (i = 0; hp->h_addr_list[i]; i++) {
--    if (memcmp(hp->h_addr_list[i], (caddr_t) & addr, sizeof(addr)) == 0)
-+    if (memcmp(hp->h_addr_list[i], &addr, sizeof(addr)) == 0)
-       return True;
-   }
- 
-diff -Naur mc-4.6.1.orig/vfs/vfs.c mc-4.6.1/vfs/vfs.c
---- mc-4.6.1.orig/vfs/vfs.c	2005-05-27 16:19:19.000000000 +0200
-+++ mc-4.6.1/vfs/vfs.c	2006-03-19 17:03:48.000000000 +0100
-@@ -740,27 +740,27 @@
- 
- #ifdef HAVE_MMAP
- static struct mc_mmapping {
--    caddr_t addr;
-+    void *addr;
-     void *vfs_info;
-     struct vfs_class *vfs;
-     struct mc_mmapping *next;
- } *mc_mmaparray = NULL;
- 
--caddr_t
--mc_mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
-+void *
-+mc_mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
- {
-     struct vfs_class *vfs;
--    caddr_t result;
-+    void *result;
-     struct mc_mmapping *mcm;
- 
-     if (fd == -1)
--	return (caddr_t) -1;
-+	return (void *) -1;
-     
-     vfs = vfs_op (fd);
--    result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info (fd), offset) : (caddr_t)-1;
--    if (result == (caddr_t)-1){
-+    result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info (fd), offset) : (void *)-1;
-+    if (result == (void *)-1){
- 	errno = ferrno (vfs);
--	return (caddr_t)-1;
-+	return (void *)-1;
-     }
-     mcm =g_new (struct mc_mmapping, 1);
-     mcm->addr = result;
-@@ -772,7 +772,7 @@
- }
- 
- int
--mc_munmap (caddr_t addr, size_t len)
-+mc_munmap (void *addr, size_t len)
- {
-     struct mc_mmapping *mcm, *mcm2 = NULL;
-     
-diff -Naur mc-4.6.1.orig/vfs/vfs.h mc-4.6.1/vfs/vfs.h
---- mc-4.6.1.orig/vfs/vfs.h	2004-11-16 17:16:08.000000000 +0100
-+++ mc-4.6.1/vfs/vfs.h	2006-03-19 17:05:57.000000000 +0100
-@@ -49,8 +49,8 @@
- int mc_ctl (int fd, int ctlop, void *arg);
- int mc_setctl (const char *path, int ctlop, void *arg);
- #ifdef HAVE_MMAP
--caddr_t mc_mmap (caddr_t, size_t, int, int, int, off_t);
--int mc_munmap (caddr_t addr, size_t len);
-+void *mc_mmap (void *, size_t, int, int, int, off_t);
-+int mc_munmap (void *addr, size_t len);
- #endif				/* HAVE_MMAP */
- 
- /* Operations for mc_ctl - on open file */
-diff -Naur mc-4.6.1.orig/vfs/vfs-impl.h mc-4.6.1/vfs/vfs-impl.h
---- mc-4.6.1.orig/vfs/vfs-impl.h	2004-09-02 15:57:59.000000000 +0200
-+++ mc-4.6.1/vfs/vfs-impl.h	2006-03-19 17:12:01.000000000 +0100
-@@ -72,9 +72,9 @@
-     int (*setctl) (struct vfs_class *me, const char *path, int ctlop,
- 		   void *arg);
- #ifdef HAVE_MMAP
--    caddr_t (*mmap) (struct vfs_class *me, caddr_t addr, size_t len,
-+    void *(*mmap) (struct vfs_class *me, void *addr, size_t len,
- 		     int prot, int flags, void *vfs_info, off_t offset);
--    int (*munmap) (struct vfs_class *me, caddr_t addr, size_t len,
-+    int (*munmap) (struct vfs_class *me, void *addr, size_t len,
- 		   void *vfs_info);
- #endif
- };
diff --git a/app-misc/mc/files/mc-4.6.1-nonblock.patch b/app-misc/mc/files/mc-4.6.1-nonblock.patch
deleted file mode 100644
index eca34aaf5289..000000000000
--- a/app-misc/mc/files/mc-4.6.1-nonblock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mc-4.6.1/src/cons.saver.c.old	2006-04-30 20:45:11.725128977 +0200
-+++ mc-4.6.1/src/cons.saver.c	2006-04-30 20:45:55.545063247 +0200
-@@ -134,7 +134,7 @@
- 
-   if (seteuid (uid) < 0)
-     die ();
--  console_fd = open (tty_name, O_RDONLY);
-+  console_fd = open (tty_name, O_RDONLY | O_NONBLOCK);
-   if (console_fd < 0)
-     die ();
-   if (fstat (console_fd, &st) < 0 || ! S_ISCHR (st.st_mode))
diff --git a/app-misc/mc/files/mc.gentoo b/app-misc/mc/files/mc.gentoo
deleted file mode 100644
index a71d249b8f6b..000000000000
--- a/app-misc/mc/files/mc.gentoo
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# A little fix so mc exits into it's current working directory
-MC_ENV=/usr/share/mc/bin/mc.sh
-
-for i in $MC_ENV; do
-	if [ -x $i ]; then
-		. $i
-	fi
-done
-
-# include this, so also xterm,kterm,gterm,etc will have default bash settings
-
-#if [ "x$SHLVL" != "x1" ]; then # We're not a login shell
-#	. /etc/profile
-#fi
diff --git a/app-misc/mc/files/mc.ini b/app-misc/mc/files/mc.ini
deleted file mode 100644
index 890658ecd2a5..000000000000
--- a/app-misc/mc/files/mc.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Midnight-Commander]
-use_8th_bit_as_meta=0
diff --git a/app-misc/mc/mc-4.6.1-r4.ebuild b/app-misc/mc/mc-4.6.1-r4.ebuild
deleted file mode 100644
index 353cbd8bd5af..000000000000
--- a/app-misc/mc/mc-4.6.1-r4.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.1-r4.ebuild,v 1.18 2009/08/02 15:20:55 ssuominen Exp $
-
-EAPI=1
-inherit flag-o-matic eutils
-
-U7Z_PV="4.29"
-U7Z="u7z-${U7Z_PV}.tar.bz2"
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-utf8-r2.patch.bz2
-	7zip? ( http://sgh-punk.narod.ru/files/u7z/${U7Z} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="7zip X gpm ncurses nls samba +slang unicode"
-
-RDEPEND="kernel_linux? ( >=sys-fs/e2fsprogs-1.19 )
-	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
-	=dev-libs/glib-2*
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( >=sys-libs/slang-1.4 )
-	samba? ( >=net-fs/samba-3.0.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )
-	x86? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
-	ppc? ( 7zip? ( >=app-arch/p7zip-4.16 ) )
-	amd64? ( 7zip? ( >=app-arch/p7zip-4.16 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use unicode && ! use slang ; then
-		eerror "You must either disable unicode useflag or, if you want a"
-		eerror "unicode-aware mc, set the slang useflag as well."
-		die "set slang or unset unicode"
-	fi
-}
-
-src_unpack() {
-	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-		unpack ${U7Z}
-	fi
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-find.patch
-	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-		epatch "${FILESDIR}"/${PN}-4.6.0-7zip.patch
-	fi
-	epatch "${FILESDIR}"/${P}-largefile.patch
-
-	# Don't crash on invalid mtimes
-	# Bug #184296
-	epatch "${FILESDIR}"/${P}-invalid-mtime.patch
-
-	if use slang && use unicode; then
-		epatch "${DISTDIR}"/${P}-utf8-r2.patch.bz2
-	fi
-	epatch "${FILESDIR}"/${P}-nonblock.patch
-	epatch "${FILESDIR}"/${P}-bash-all.patch
-
-	# Prevent lazy bindings in cons.saver binary. (bug #135009)
-	#  - not using bindnow-flags() because cons.saver is only built on GNU/Linux
-	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
-		src/Makefile.in
-
-	# docs try to run the files it just built while trying convert .1 to .hlp files.
-	# this will never work for cross compiles, so we simply don't make docs.
-	if tc-is-cross-compiler; then
-		sed -i -e s/'lib doc syntax'/'lib syntax'/ Makefile.in
-	fi
-
-	# Correctly generate charset.alias.
-	# Fixes bugs  71275, 105960 and 169678
-	epatch "${FILESDIR}"/${P}-charset-locale-aliases.patch
-}
-
-src_compile() {
-	append-flags -I/usr/include/gssapi
-
-	filter-flags -malign-double
-
-	local myconf=""
-
-	if ! use slang && ! use ncurses ; then
-		myconf="${myconf} --with-screen=mcslang"
-	elif use ncurses && ! use slang ; then
-		myconf="${myconf} --with-screen=ncurses"
-	else
-		use slang && myconf="${myconf} --with-screen=slang"
-	fi
-
-	myconf="${myconf} `use_with gpm gpm-mouse`"
-
-	use nls \
-		&& myconf="${myconf} --with-included-gettext" \
-		|| myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_with X x`"
-
-	use samba \
-		&& myconf="${myconf} --with-samba --with-configdir=/etc/samba --with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-		|| myconf="${myconf} --without-samba"
-
-	econf \
-		--with-vfs \
-		--with-ext2undel \
-		--with-edit \
-		--enable-charset \
-	${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	cat "${FILESDIR}"/chdir-4.6.0.gentoo >>\
-		"${S}"/lib/mc-wrapper.sh
-
-	make install DESTDIR="${D}" || die "make install failed"
-
-	# install cons.saver setuid, to actually work
-	fperms u+s /usr/$(get_libdir)/mc/cons.saver
-
-	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
-
-	insinto /usr/share/mc
-	doins "${FILESDIR}"/mc.gentoo
-	doins "${FILESDIR}"/mc.ini
-
-	if ( use x86 || use amd64 || use ppc ) && use 7zip; then
-		cd ../${U7Z_PV}
-		exeinto /usr/share/mc/extfs
-		doexe u7z
-		dodoc readme.u7z
-		newdoc ChangeLog ChangeLog.u7z
-	fi
-
-	insinto /usr/share/mc/syntax
-	doins "${FILESDIR}"/ebuild.syntax
-	cd "${D}"/usr/share/mc/syntax
-	epatch "${FILESDIR}"/${PN}-4.6.0-ebuild-syntax.patch
-}
-
-pkg_postinst() {
-	elog "Add the following line to your ~/.bashrc to"
-	elog "allow mc to chdir to its latest working dir at exit"
-	elog ""
-	elog "# Midnight Commander chdir enhancement"
-	elog "if [ -f /usr/share/mc/mc.gentoo ]; then"
-	elog "	. /usr/share/mc/mc.gentoo"
-	elog "fi"
-}
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index d633ea273a7c..9ff89d0d3b61 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer>
-  <email>wired@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="7zip">Add support for 7zip archives</flag>
-  <flag name="edit">Build mcedit application</flag>
-</use>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>wired@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="edit">Build mcedit application</flag>
+  </use>
 </pkgmetadata>