Cleanup.

(Portage version: 2.1.1_pre3-r1)
 (Unsigned Manifest commit)

10 files changed, 0 insertions, 557 deletions

diff --git a/app-misc/mc/files/digest-mc-4.6.0-r14 b/app-misc/mc/files/digest-mc-4.6.0-r14
deleted file mode 100644
index 7fb7a2a420a1..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r14
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 23a5069637af088015fe5f0de8c42883 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
-RMD160 c637f92b407fd0321efede161a8c13ba99b68ffd mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
-SHA256 0c137b7e9fe9cc623862aba21457b18f4295bf0f8053059474d7f5607833e2e8 mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
-MD5 c2eb2135bcf8dbed1c2fc4a6e41e4917 mc-4.6.0-sambalib-3.0.10.patch.bz2 401006
-RMD160 cc10310806c090b4eeb2898948b488728c814fa9 mc-4.6.0-sambalib-3.0.10.patch.bz2 401006
-SHA256 7dff3b66734a6a5df74bb8a5899f1b230ed7ab9de4bf16a1feb094f7c1f80531 mc-4.6.0-sambalib-3.0.10.patch.bz2 401006
-MD5 3f426ce18f8bf82d9e9c3347525d75e8 mc-4.6.0-utf8.patch.bz2 30359
-RMD160 3fb8cc823b21657fd4632cb93bf0c3be7138773c mc-4.6.0-utf8.patch.bz2 30359
-SHA256 efe9eccb3fdd59356e17a0775dc781c94fea539687057efdf0975e02bdb4412a mc-4.6.0-utf8.patch.bz2 30359
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-RMD160 e98843d8f3eda8ab691b3b0abe165d6d80010fe0 mc-4.6.0.tar.gz 3727676
-SHA256 396a2de3eed6d5d3c4604b372e11f6c0f18644ef3d8ee14978b715ec26aa0974 mc-4.6.0.tar.gz 3727676
-MD5 60a8e4524554a550472622db7fcf728f u7z-4.16beta.tar.bz2 3041
-RMD160 4a682b3b4bc6c09c7414f8d585829763f6c112ea u7z-4.16beta.tar.bz2 3041
-SHA256 668ed6a0484358e51de1be8d8581cc36dd3c915872fb1082550437a2d7aa67dd u7z-4.16beta.tar.bz2 3041
diff --git a/app-misc/mc/files/mc-4.6.0-bug-102356.patch b/app-misc/mc/files/mc-4.6.0-bug-102356.patch
deleted file mode 100644
index 1ba83fea4ccb..000000000000
--- a/app-misc/mc/files/mc-4.6.0-bug-102356.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- mc-4.6.0-orig/vfs/smb/configure	2005-08-13 13:00:45.000000000 +0200
-+++ mc-4.6.0/vfs/smb/configure	2005-08-13 13:34:45.000000000 +0200
-@@ -3546,6 +3546,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/utsname.h>
- main() {
-diff -urN mc-4.6.0-orig/vfs/smb/configure.in mc-4.6.0/vfs/smb/configure.in
---- mc-4.6.0-orig/vfs/smb/configure.in	2005-08-13 13:00:45.000000000 +0200
-+++ mc-4.6.0/vfs/smb/configure.in	2005-08-13 13:34:16.000000000 +0200
-@@ -458,6 +458,8 @@
-         old_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-        AC_TRY_RUN([
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/utsname.h>
- main() {
-diff -urN mc-4.6.0-orig/vfs/smb/tests/crypttest.c mc-4.6.0/vfs/smb/tests/crypttest.c
---- mc-4.6.0-orig/vfs/smb/tests/crypttest.c	2005-08-13 13:00:45.000000000 +0200
-+++ mc-4.6.0/vfs/smb/tests/crypttest.c	2005-08-13 13:35:23.000000000 +0200
-@@ -803,9 +803,9 @@
- 	strcpy(passwd, "12345678");
- 	strcpy(salt, "12345678");
- 	
--	strcpy(c_out1, crypt(passwd, salt));
-+	strcpy(c_out1, (const char *) crypt(passwd, salt));
- 	salt[2] = '\0';
--	strcpy(c_out2, crypt(passwd, salt));
-+	strcpy(c_out2, (const char *) crypt(passwd, salt));
- 
- 	/*
- 	 * If the non-trucated salt fails but the
diff --git a/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch b/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch
deleted file mode 100644
index 6fd3cf44d273..000000000000
--- a/app-misc/mc/files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- mc-4.5.55.orig/vfs/fish.c	2004-10-31 08:09:30.000000000 +0100
-+++ mc-4.5.55/vfs/fish.c	2004-10-31 08:30:02.000000000 +0100
-@@ -222,7 +222,7 @@ open_archive_int (vfs *me, vfs_s_super *
- 	print_vfs_message( _("fish: Waiting for initial line...") );
-         if (!vfs_s_get_line(me, SUP.sockr, answer, sizeof(answer), ':'))
- 	    ERRNOR (E_PROTO, -1);
--	print_vfs_message( answer );
-+	print_vfs_message( "%s", answer );
- 	if (strstr(answer, "assword")) {
- 
-     /* Currently, this does not work. ssh reads passwords from
---- mc-4.5.55.orig/src/utilunix.c	2004-12-01 12:26:20.000000000 +0100
-+++ mc-4.5.55/src/utilunix.c	2004-12-01 12:26:27.000000000 +0100
-@@ -396,7 +396,7 @@ close_error_pipe (int error, char *text)
- 	close (2);
- 	dup (old_error);
- 	close (old_error);
--	len = read (error_pipe[0], msg, MAX_PIPE_SIZE);
-+	len = read (error_pipe[0], msg, MAX_PIPE_SIZE - 1);
- 
- 	if (len >= 0)
- 	    msg[len] = 0;
-@@ -424,7 +424,7 @@ void check_error_pipe (void)
-     char error[MAX_PIPE_SIZE];
-     int len = 0;
-     if (old_error >= 0){
--	while (len < MAX_PIPE_SIZE)
-+	while (len < MAX_PIPE_SIZE - 1)
- 	{
-             fd_set select_set;
-             struct timeval timeout;
---- mc-4.5.55.orig/vfs/sfs.c	2001-08-11 06:57:17.000000000 +0200
-+++ mc-4.5.55/vfs/sfs.c	2004-12-08 19:01:06.000000000 +0100
-@@ -341,6 +342,8 @@ static int sfs_init (vfs *me)
- 	    }	    
- 	    c++;
- 	}
-+	if (!*c)
-+		goto invalid_line;
- 	c++;
- 	*(semi+1) = 0;
- 	if ((semi = strchr (c, '\n')))
---- mc-4.5.55.orig/vfs/cpio.c	2004-10-31 08:09:30.000000000 +0100
-+++ mc-4.5.55/vfs/cpio.c	2004-12-08 19:07:21.000000000 +0100
-@@ -454,7 +454,8 @@ static int cpio_create_entry(vfs *me, vf
- 	}
-     }
- 
--    while(name[strlen(name)-1] == PATH_SEP) name[strlen(name)-1] = 0;
-+    for (tn = name + strlen (name) - 1; tn >= name && *tn == PATH_SEP; tn--)
-+        *tn = 0;
-     if((tn = strrchr(name, PATH_SEP))) {
- 	*tn = 0;
- 	root = vfs_s_find_inode(me, root, name, LINK_FOLLOW, FL_MKDIR); /* CHECKME! What function here? */
---- mc-4.5.55.orig/vfs/extfs.c	2004-10-31 08:09:30.000000000 +0100
-+++ mc-4.5.55/vfs/extfs.c	2004-12-05 21:05:21.000000000 +0100
-@@ -1362,14 +1362,13 @@ static int extfs_init (vfs *me)
- 	    g_free (mc_extfsini);
- 	    return 0;
- 	}
--	if (*key == '#')
-+	if (*key == '#' || *key == '\n')
- 	    continue;
- 
- 	if ((c = strchr (key, '\n'))){
--	    *c = 0;
-+	    *c-- = 0;
-+	} else {	/* Last line without newline or strlen (key) > 255 */
- 	    c = &key [strlen (key) - 1];
--	} else {
--	    c = key;
- 	}
- 	extfs_need_archive [extfs_no] = !(*c == ':');
- 	if (*c == ':')
---- mc-4.5.55.orig/vfs/sfs.c.org	2005-02-12 13:15:15.000000000 +0100
-+++ mc-4.5.55.orig/vfs/sfs.c	2005-02-12 13:15:58.000000000 +0100
-@@ -332,13 +332,14 @@
- 	    }
- 
- 	if (!semi){
-+	    invalid_line:
- 	    fprintf (stderr, _("Warning: Invalid line in %s:\n%s\n"),
- 		     "sfs.ini", key);
- 	    continue;
- 	}
- 
- 	c = semi + 1;
--	while ((*c != ' ') && (*c != '\t')) {
-+	while (*c && (*c != ' ') && (*c != '\t')) {
- 	    switch (*c) {
- 	    case '1': flags |= F_1; break;
- 	    case '2': flags |= F_2; break;
---- mc-4.5.55.orig/edit/editcmd.c.org	2005-02-12 13:17:33.000000000 +0100
-+++ mc-4.5.55.orig/edit/editcmd.c	2005-02-12 13:17:48.000000000 +0100
-@@ -232,7 +232,7 @@
- 	g_free (savedir);
- 	fd = mc_mkstemps (&savename, saveprefix, NULL);
- 	g_free (saveprefix);
--	if (!savename)
-+	if (fd == -1)
- 	    return 0;
- 	/* FIXME:
- 	 * Close for now because mc_mkstemps use pure open system call 
diff --git a/app-misc/mc/files/mc-4.6.0-cpan-2003-1023.patch b/app-misc/mc/files/mc-4.6.0-cpan-2003-1023.patch
deleted file mode 100644
index 294ecb587e25..000000000000
--- a/app-misc/mc/files/mc-4.6.0-cpan-2003-1023.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru mc-4.5.55/vfs/direntry.c mc-4.5.55.new/vfs/direntry.c
---- mc-4.5.55/vfs/direntry.c	2001-08-16 15:23:05.000000000 -0700
-+++ mc-4.5.55.new/vfs/direntry.c	2004-01-06 16:36:00.000000000 -0800
-@@ -374,6 +374,7 @@
- 	}
-     }
- 
-+#if 0
-     /* Convert absolute paths to relative ones */
-     if (*linkname == PATH_SEP) {
- 	char *p, *q;
-@@ -391,6 +392,7 @@
- 	}
- 	linkname = buf;
-     }
-+#endif
- 
-     return (MEDATA->find_entry) (me, entry->dir, linkname, follow - 1, 0);
- }
diff --git a/app-misc/mc/files/mc-4.6.0-find.patch b/app-misc/mc/files/mc-4.6.0-find.patch
deleted file mode 100644
index 7ec088a2d116..000000000000
--- a/app-misc/mc/files/mc-4.6.0-find.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Naur mc-4.6.0-orig/src/cmd.c mc-4.6.0/src/cmd.c
---- mc-4.6.0-orig/src/cmd.c	2003-02-05 16:54:33.000000000 +0100
-+++ mc-4.6.0/src/cmd.c	2003-09-15 17:24:51.000000000 +0200
-@@ -542,7 +542,7 @@
-             if (dirflag)
-                 continue;
- 	}
--	c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file);
-+	c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file, 0);
- 	if (c == -1){
- 	    message (1, MSG_ERROR, _("  Malformed regular expression  "));
- 	    g_free (reg_exp);
-@@ -588,7 +588,7 @@
-             if (dirflag)
-                 continue;
-         }
--	c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file);
-+	c = regexp_match (reg_exp_t, cpanel->dir.list [i].fname, match_file, 0);
- 	if (c == -1){
- 	    message (1, MSG_ERROR, _("  Malformed regular expression  "));
- 	    g_free (reg_exp);
-diff -Naur mc-4.6.0-orig/src/dir.c mc-4.6.0/src/dir.c
---- mc-4.6.0-orig/src/dir.c	2003-01-21 01:41:45.000000000 +0100
-+++ mc-4.6.0/src/dir.c	2003-09-15 17:25:06.000000000 +0200
-@@ -404,7 +404,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.0-orig/src/ext.c mc-4.6.0/src/ext.c
---- mc-4.6.0-orig/src/ext.c	2002-11-14 08:25:19.000000000 +0100
-+++ mc-4.6.0/src/ext.c	2003-09-15 17:25:32.000000000 +0200
-@@ -450,7 +450,7 @@
- 
-     if (content_string && content_string[0]
- 	&& regexp_match (ptr, content_string + content_shift,
--			 match_normal)) {
-+			 match_normal, 0)) {
- 	found = 1;
-     }
- 
-@@ -593,11 +593,11 @@
- 		/* Do not transform shell patterns, you can use shell/ for
- 		 * that
- 		 */
--		if (regexp_match (p, filename, match_normal))
-+		if (regexp_match (p, filename, match_normal, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "directory/", 10)) {
- 		if (S_ISDIR (mystat.st_mode)
--		    && regexp_match (p + 10, filename, match_normal))
-+		    && regexp_match (p + 10, filename, match_normal, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "shell/", 6)) {
- 		p += 6;
-diff -Naur mc-4.6.0-orig/src/find.c mc-4.6.0/src/find.c
---- mc-4.6.0-orig/src/find.c	2002-12-24 12:28:26.000000000 +0100
-+++ mc-4.6.0/src/find.c	2003-09-15 17:55:21.000000000 +0200
-@@ -507,6 +507,7 @@
-     static int pos;
-     static int subdirs_left = 0;
-     char *tmp_name;		/* For building file names */
-+    int flags = 0;
- 
-     if (!h) { /* someone forces me to close dirp */
- 	if (dirp) {
-@@ -516,6 +517,10 @@
-         dp = 0;
- 	return 1;
-     }
-+
-+    if (!(case_sense->state & C_BOOL))
-+        flags |= REG_ICASE;
-+
-  do_search_begin:
-     while (!dp){
- 	
-@@ -589,7 +594,7 @@
- 	}
-     }
- 
--    if (regexp_match (find_pattern, dp->d_name, match_file)){
-+    if (regexp_match (find_pattern, dp->d_name, match_file, flags)){
- 	if (content_pattern)
- 	    search_content (h, directory, dp->d_name);
- 	else 
-diff -Naur mc-4.6.0-orig/src/user.c mc-4.6.0/src/user.c
---- mc-4.6.0-orig/src/user.c	2002-11-29 04:03:53.000000000 +0100
-+++ mc-4.6.0/src/user.c	2003-09-15 17:26:18.000000000 +0200
-@@ -390,18 +390,18 @@
- 	    break;
- 	case 'f': /* file name pattern */
- 	    p = extract_arg (p, 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);
- 	        *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);
--	    *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);
-diff -Naur mc-4.6.0-orig/src/util.c mc-4.6.0/src/util.c
---- mc-4.6.0-orig/src/util.c	2003-01-28 23:58:23.000000000 +0100
-+++ mc-4.6.0/src/util.c	2003-09-15 17:55:00.000000000 +0200
-@@ -537,26 +537,29 @@
- 	return  g_strdup (pattern);
- }
- 
--int regexp_match (char *pattern, char *string, int match_type)
-+int regexp_match (char *pattern, 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;
- 
--    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;
- 	}
- 	pattern = convert_pattern (pattern, match_type, 0);
--	if (regcomp (&r, pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS)) {
-+	
-+	if (regcomp (&r, pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS|flags)) {
- 	    g_free (pattern);
- 	    return -1;
- 	}
- 	old_pattern = pattern;
- 	old_type = match_type;
-+	old_flags = flags;
-     }
-     rval = !regexec (&r, string, 0, NULL, 0);
-     return rval;
-diff -Naur mc-4.6.0-orig/src/util.h mc-4.6.0/src/util.h
---- mc-4.6.0-orig/src/util.h	2003-01-27 22:07:29.000000000 +0100
-+++ mc-4.6.0/src/util.h	2003-09-15 17:23:04.000000000 +0200
-@@ -65,7 +65,7 @@
- enum { match_file, match_normal };
- extern int easy_patterns;
- char *convert_pattern (char *pattern, int match_type, int do_group);
--int regexp_match (char *pattern, char *string, int match_type);
-+int regexp_match (char *pattern, char *string, int match_type, int flags);
- 
- /* Error pipes */
- void open_error_pipe (void);
diff --git a/app-misc/mc/files/mc-4.6.0-ftp.patch b/app-misc/mc/files/mc-4.6.0-ftp.patch
deleted file mode 100644
index ff24b01ded60..000000000000
--- a/app-misc/mc/files/mc-4.6.0-ftp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vfs/utilvfs.c	2002-12-15 13:38:18.000000000 -0600
-+++ vfs/utilvfs.c	2004-07-25 14:36:26.000000000 -0500
-@@ -87,7 +87,7 @@
-     }
- 
-     /* search for any possible user */
--    at = strchr (pcopy, '@');
-+    at = strrchr (pcopy, '@');
- 
-     /* We have a username */
-     if (at) {
diff --git a/app-misc/mc/files/mc-4.6.0-gcc4.patch b/app-misc/mc/files/mc-4.6.0-gcc4.patch
deleted file mode 100644
index 94a090a3173d..000000000000
--- a/app-misc/mc/files/mc-4.6.0-gcc4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mc-4.6.0/vfs/smb/popt_common.h	2005-04-26 11:08:25.000000000 +0000
-+++ mc-4.6.0.az/vfs/smb/popt_common.h	2005-04-26 11:08:43.000000000 +0000
-@@ -22,10 +22,10 @@
- #define _POPT_COMMON_H
- 
- /* Common popt structures */
--extern struct poptOption popt_common_samba[];
--extern struct poptOption popt_common_connection[];
--extern struct poptOption popt_common_version[];
--extern struct poptOption popt_common_credentials[];
-+extern struct poptOption *popt_common_samba;
-+extern struct poptOption *popt_common_connection;
-+extern struct poptOption *popt_common_version;
-+extern struct poptOption *popt_common_credentials;
- 
- #ifndef POPT_TABLEEND
- #define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
diff --git a/app-misc/mc/files/mc-4.6.0-key.c.patch b/app-misc/mc/files/mc-4.6.0-key.c.patch
deleted file mode 100644
index 351db2acdd1c..000000000000
--- a/app-misc/mc/files/mc-4.6.0-key.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/key.c.org	2004-11-17 14:37:22.887315224 +0100
-+++ src/key.c	2004-11-17 14:37:57.656029576 +0100
-@@ -262,7 +262,7 @@
-     define_sequences (mc_default_keys);
-     
-     /* Terminfo on irix does not have some keys */
--    if ((!strncmp (term, "iris-ansi", 9)) || (!strncmp (term, "xterm", 5)))
-+    if (term && (!strncmp (term, "iris-ansi", 9)) || (!strncmp (term, "xterm", 5)))
- 	define_sequences (xterm_key_defines);
-     
-     define_sequences (mc_bindings);
-@@ -271,7 +271,7 @@
-     load_xtra_key_defines();
-     
- #ifdef __QNX__
--    if (strncmp(term, "qnx", 3) == 0){
-+    if (term && strncmp(term, "qnx", 3) == 0){
- 	/* Modify the default value of use_8th_bit_as_meta: we would
- 	 * like to provide a working mc for a newbie who knows nothing
- 	 * about [Options|Display bits|Full 8 bits input]...
diff --git a/app-misc/mc/files/mc-4.6.0-largefile.patch b/app-misc/mc/files/mc-4.6.0-largefile.patch
deleted file mode 100644
index 24bfe90b03a0..000000000000
--- a/app-misc/mc/files/mc-4.6.0-largefile.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -ur mc-4.6.0-gentoo/src/view.c mc-4.6.0-largefile/src/view.c
---- mc-4.6.0-gentoo/src/view.c	2004-09-16 03:59:30.177753168 +0400
-+++ mc-4.6.0-largefile/src/view.c	2004-09-16 03:51:31.000000000 +0400
-@@ -81,6 +81,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
-+
- /* The growing buffers data types */
- typedef struct block_ptr_t {
-     unsigned char *data;
-@@ -580,7 +586,7 @@
-     view->data =
- 	mc_mmap (0, view->s.st_size, PROT_READ, MAP_FILE | MAP_SHARED,
- 		 view->file, 0);
--    if ((caddr_t) view->data != (caddr_t) - 1) {
-+    if (view->data != (void *)-1) {
- 	/* mmap worked */
- 	view->first = 0;
- 	view->bytes_read = view->s.st_size;
-@@ -593,6 +599,9 @@
-      * 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 */
-+
-     if ((gulong) view->s.st_size == view->s.st_size)
-       view->data = (unsigned char *) g_try_malloc (view->s.st_size);
-     else
-diff -ur mc-4.6.0-gentoo/vfs/local.c mc-4.6.0-largefile/vfs/local.c
---- mc-4.6.0-gentoo/vfs/local.c	2002-09-23 10:45:33.000000000 +0400
-+++ mc-4.6.0-largefile/vfs/local.c	2004-09-16 03:45:21.000000000 +0400
-@@ -282,8 +282,8 @@
- }
- 
- #ifdef HAVE_MMAP
--caddr_t
--local_mmap (vfs *me, caddr_t addr, size_t len, int prot, int flags, void *data, off_t offset)
-+void *
-+local_mmap (vfs *me, void *addr, size_t len, int prot, int flags, void *data, off_t offset)
- {
-     int fd = * (int *)data;
- 
-@@ -291,7 +291,7 @@
- }
- 
- int
--local_munmap (vfs *me, caddr_t addr, size_t len, void *data)
-+local_munmap (vfs *me, void *addr, size_t len, void *data)
- {
-     return munmap (addr, len);
- }
-diff -ur mc-4.6.0-gentoo/vfs/local.h mc-4.6.0-largefile/vfs/local.h
---- mc-4.6.0-gentoo/vfs/local.h	1998-12-16 01:30:55.000000000 +0300
-+++ mc-4.6.0-largefile/vfs/local.h	2004-09-16 03:45:21.000000000 +0400
-@@ -7,8 +7,8 @@
- extern int local_errno (vfs *me);
- extern int local_lseek (void *data, off_t offset, int whence);
- #ifdef HAVE_MMAP
--extern caddr_t local_mmap (vfs *me, caddr_t addr, size_t len, int prot, int flags, void *data, off_t offset);
--extern int local_munmap (vfs *me, caddr_t addr, size_t len, void *data);
-+extern void *local_mmap (vfs *me, void *addr, size_t len, int prot, int flags, void *data, off_t offset);
-+extern int local_munmap (vfs *me, void *addr, size_t len, void *data);
- #endif
- 
- #endif
-diff -ur mc-4.6.0-gentoo/vfs/samba/lib/util.c mc-4.6.0-largefile/vfs/samba/lib/util.c
---- mc-4.6.0-gentoo/vfs/samba/lib/util.c	2004-09-16 01:38:29.000000000 +0400
-+++ mc-4.6.0-largefile/vfs/samba/lib/util.c	2004-09-16 03:45:21.000000000 +0400
-@@ -1830,7 +1830,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 -ur mc-4.6.0-gentoo/vfs/vfs.c mc-4.6.0-largefile/vfs/vfs.c
---- mc-4.6.0-gentoo/vfs/vfs.c	2004-09-16 01:38:30.000000000 +0400
-+++ mc-4.6.0-largefile/vfs/vfs.c	2004-09-16 03:45:21.000000000 +0400
-@@ -995,27 +995,27 @@
- 
- #ifdef HAVE_MMAP
- static struct mc_mmapping {
--    caddr_t addr;
-+    void *addr;
-     void *vfs_info;
-     vfs *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)
- {
-     vfs *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;
-@@ -1027,7 +1027,7 @@
- }
- 
- int
--mc_munmap (caddr_t addr, size_t len)
-+mc_munmap (void *addr, size_t len)
- {
-     struct mc_mmapping *mcm, *mcm2 = NULL;
-     
-diff -ur mc-4.6.0-gentoo/vfs/vfs.h mc-4.6.0-largefile/vfs/vfs.h
---- mc-4.6.0-gentoo/vfs/vfs.h	2002-12-11 12:36:51.000000000 +0300
-+++ mc-4.6.0-largefile/vfs/vfs.h	2004-09-16 03:45:21.000000000 +0400
-@@ -88,9 +88,9 @@
- 	int  (*ctl)            (void *vfs_info, int ctlop, int arg);
- 	int  (*setctl)         (vfs *me, char *path, int ctlop, char *arg);
- #ifdef HAVE_MMAP
--	caddr_t (*mmap)        (vfs *me, caddr_t addr, size_t len, int prot,
-+	void *(*mmap)          (vfs *me, void *addr, size_t len, int prot,
- 				int flags, void *vfs_info, off_t offset);
--	int (*munmap)          (vfs *me, caddr_t addr, size_t len,
-+	int (*munmap)          (vfs *me, void *addr, size_t len,
- 				void *vfs_info);
- #endif	
-     };
-@@ -208,9 +208,9 @@
-         int mc_ctl (int fd, int ctlop, int arg);
-         int mc_setctl (char *path, int ctlop, char *arg);
- #ifdef HAVE_MMAP
--	caddr_t mc_mmap (caddr_t, size_t, int, int, int, off_t);
--	int mc_unmap (caddr_t, size_t);
--        int mc_munmap (caddr_t addr, size_t len);
-+	void *mc_mmap (void *, size_t, int, int, int, off_t);
-+	int mc_unmap (void *, size_t);
-+        int mc_munmap (void *addr, size_t len);
- #endif /* HAVE_MMAP */
- 
- #else
diff --git a/app-misc/mc/files/mc-4.6.0-vfs.patch b/app-misc/mc/files/mc-4.6.0-vfs.patch
deleted file mode 100644
index 6b1212a3bba8..000000000000
--- a/app-misc/mc/files/mc-4.6.0-vfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/mc.ext.in.1	2004-04-13 13:59:03.977958307 +0200
-+++ lib/mc.ext.in	2004-04-13 13:59:47.962917739 +0200
-@@ -388,7 +388,7 @@
- 	# Open=%cd %p#utar
- 	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
- 
--regex/\.tar\.bz2$
-+regex/\.t(ar\.bz2|bz|bz2)$
- 	Open=%cd %p#utar
- 	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
-