Fixed handling of external programs with xdg USE flag being unset (bug #449936). Removed old versions. Added myself as maintainer

(Portage version: 2.2.0_alpha150/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

13 files changed, 27 insertions, 928 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index d0a8d948b6ec..ed668901520d 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,21 @@
 # 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.277 2013/01/07 22:22:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.278 2013/01/11 11:38:42 polynomial-c Exp $
+
+*mc-4.8.7-r1 (11 Jan 2013)
+
+  11 Jan 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -files/mc-4.8.1-fix-fallocate-xBSD.patch, -mc-4.8.3-r2.ebuild,
+  -files/mc-4.8.3-fix-chown-crash.patch,
+  -files/mc-4.8.3-fix-relative-symlink-creation-crash.patch,
+  -files/mc-4.8.3-missing-do_panel_cd_stub_env.c, -mc-4.8.4-r3.ebuild,
+  -files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch,
+  -files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch,
+  -files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch,
+  -files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch, -mc-4.8.6.ebuild,
+  +mc-4.8.7-r1.ebuild, metadata.xml:
+  Fixed handling of external programs with xdg USE flag being unset (bug
+  #449936). Removed old versions. Added myself as maintainer.
 
   07 Jan 2013; Agostino Sarubbo <ago@gentoo.org> mc-4.8.7.ebuild:
   Stable for alpha, wrt bug #436518
diff --git a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch b/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
deleted file mode 100644
index 85ce611945b3..000000000000
--- a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a6ca3c289994a3a9ab8f481582e2632109b759f0 Mon Sep 17 00:00:00 2001
-From: Egmont Koblinger <egmont@gmail.com>
-Date: Thu, 19 Jan 2012 14:11:10 +0400
-Subject: [PATCH] Ticket #2689 (fix fallocate detection for xBSD)
-
-    fixed macros 'mc-get-fs-info.m4' for correct 'fallocate' detection under xBSD
-
-Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
----
- m4.include/mc-get-fs-info.m4 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/m4.include/mc-get-fs-info.m4 b/m4.include/mc-get-fs-info.m4
-index bc0ca54..b1474d8 100644
---- a/m4.include/mc-get-fs-info.m4
-+++ b/m4.include/mc-get-fs-info.m4
-@@ -5,7 +5,7 @@ dnl
- 
- AC_DEFUN([gl_POSIX_FALLOCATE], [
-     dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
--    AC_TRY_COMPILE([
-+    AC_TRY_LINK([
-         #define _XOPEN_SOURCE 600
-         #include <stdlib.h>
-         #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
--- 
-1.7.8.3
-
diff --git a/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch b/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch
deleted file mode 100644
index 8ea232d15593..000000000000
--- a/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://www.midnight-commander.org/ticket/2784
-https://www.midnight-commander.org/changeset/ac880c71a74c1fc75d7162b2ca3613970479e663
-
---- mc-4.8.3/src/filemanager/chown.c
-+++ mc-4.8.3/src/filemanager/chown.c
-@@ -378,7 +378,7 @@
-                     if (mc_chown (fname_vpath, new_user, new_group) == -1)
-                         message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"),
-                                  fname, unix_error_string (errno));
--                    vfs_path_free (vpath);
-+                    vfs_path_free (fname_vpath);
-                 }
-                 else
-                     apply_chowns (new_user, new_group);
diff --git a/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch b/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch
deleted file mode 100644
index cd2cda67f81c..000000000000
--- a/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/413691
-
-commit 038b5e7406d177792d3e2cd904f6d32e5f392903
-Author: Andrew Borodin <aborodin@vmail.ru>
-Date:   Tue Apr 24 20:41:37 2012 +0400
-
-    Ticket #2787: crash when creating relative symlink.
-    
-    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
-diff --git a/lib/util.c b/lib/util.c
-index 2c6011b..490bdfc 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -112,14 +112,14 @@ is_8bit_printable (unsigned char c)
- static char *
- resolve_symlinks (const vfs_path_t *vpath)
- {
--    char *p;
-+    char *p, *p2;
-     char *buf, *buf2, *q, *r, c;
-     struct stat mybuf;
- 
-     if (vpath->relative)
-         return NULL;
- 
--    p = vfs_path_to_str (vpath);
-+    p = p2 = vfs_path_to_str (vpath);
-     r = buf = g_malloc (MC_MAXPATHLEN);
-     buf2 = g_malloc (MC_MAXPATHLEN);
-     *r++ = PATH_SEP;
-@@ -181,7 +181,7 @@ resolve_symlinks (const vfs_path_t *vpath)
- 
-   ret:
-     g_free (buf2);
--    g_free (p);
-+    g_free (p2);
-     return buf;
- }
- 
diff --git a/app-misc/mc/files/mc-4.8.3-missing-do_panel_cd_stub_env.c b/app-misc/mc/files/mc-4.8.3-missing-do_panel_cd_stub_env.c
deleted file mode 100644
index 5591880f919e..000000000000
--- a/app-misc/mc/files/mc-4.8.3-missing-do_panel_cd_stub_env.c
+++ /dev/null
@@ -1,397 +0,0 @@
-#include "src/subshell.h"
-#include "src/setup.h"
-
-
-panels_options_t panels_options;
-struct mc_fhl_struct *mc_filehighlight;
-int confirm_execute = 0;
-int auto_save_setup = 0;
-int free_space = 0;
-int horizontal_split = 0;
-int first_panel_size = 0;
-int default_source_codepage = 0;
-int menubar_visible = 1;
-WPanel *current_panel;
-WInput *cmdline;
-WMenuBar *the_menubar;
-const global_keymap_t *panel_map;
-gboolean command_prompt;
-int saving_setup;
-
-panels_layout_t panels_layout = {
-    .horizontal_split = 0,
-    .vertical_equal = 1,
-    .left_panel_size = 0,
-    .horizontal_equal = 1,
-    .top_panel_size = 0
-};
-
-WInput *
-command_new (int y, int x, int cols)
-{
-    WInput *cmd;
-    const input_colors_t command_colors = {
-        DEFAULT_COLOR,
-        COMMAND_MARK_COLOR,
-        DEFAULT_COLOR,
-        COMMAND_HISTORY_COLOR
-    };
-
-    cmd = input_new (y, x, (int *) command_colors, cols, "", "cmdline",
-                     INPUT_COMPLETE_DEFAULT | INPUT_COMPLETE_CD | INPUT_COMPLETE_COMMANDS |
-                     INPUT_COMPLETE_SHELL_ESC);
-
-    /* Add our hooks */
-    cmd->widget.callback = NULL;
-
-    return cmd;
-}
-
-int
-do_cd (const vfs_path_t *new_dir, enum cd_enum exact)
-{
-    (void) new_dir;
-    (void) exact;
-
-    return 0;
-}
-
-void
-do_subshell_chdir (const vfs_path_t * vpath, gboolean update_prompt, gboolean reset_prompt)
-{
-    (void) vpath;
-    (void) update_prompt;
-    (void) reset_prompt;
-}
-
-void
-shell_execute (const char *command, int flags)
-{
-    (void) command;
-    (void) flags;
-}
-
-void
-panel_load_setup (WPanel * panel, const char *section)
-{
-    (void) panel;
-    (void) section;
-}
-
-void
-panel_save_setup (WPanel * panel, const char *section)
-{
-    (void) panel;
-    (void) section;
-}
-
-void
-free_my_statfs (void)
-{
-
-}
-
-int
-select_charset (int center_y, int center_x, int current_charset, gboolean seldisplay)
-{
-    (void) center_y;
-    (void) center_x;
-    (void) current_charset;
-    (void) seldisplay;
-
-    return 0;
-}
-
-void
-update_xterm_title_path (void)
-{
-}
-
-void
-init_my_statfs (void)
-{
-}
-void
-my_statfs (struct my_statfs *myfs_stats, const char *path)
-{
-    (void) myfs_stats;
-    (void) path;
-}
-
-void
-clean_dir (dir_list * list, int count)
-{
-    (void) list;
-    (void) count;
-
-}
-
-struct Widget *
-get_panel_widget (int idx)
-{
-    (void) idx;
-
-    return NULL;
-}
-
-
-int
-do_load_dir (const vfs_path_t *vpath, dir_list * list, sortfn * sort, gboolean reverse,
-                 gboolean case_sensitive, gboolean exec_ff, const char *fltr)
-{
-    (void) vpath;
-    (void) list;
-    (void) sort;
-    (void) reverse;
-    (void) case_sensitive;
-    (void) exec_ff;
-    (void) fltr;
-
-    return 0;
-}
-
-int
-do_reload_dir (const vfs_path_t * vpath, dir_list * list, sortfn * sort, int count,
-                   gboolean reverse, gboolean case_sensitive, gboolean exec_ff, const char *fltr)
-{
-    (void) vpath;
-    (void) list;
-    (void) sort;
-    (void) count;
-    (void) reverse;
-    (void) case_sensitive;
-    (void) exec_ff;
-    (void) fltr;
-
-    return 0;
-
-}
-
-void
-do_sort (dir_list * list, sortfn * sort, int top, gboolean reverse,
-              gboolean case_sensitive, gboolean exec_ff)
-{
-    (void) list;
-    (void) sort;
-    (void) top;
-    (void) reverse;
-    (void) case_sensitive;
-    (void) exec_ff;
-}
-
-int
-regex_command (const vfs_path_t *filename, const char *action, int *move_dir)
-{
-    (void) filename;
-    (void) action;
-    (void) move_dir;
-
-    return 0;
-}
-
-gboolean
-if_link_is_exe (const vfs_path_t *full_name, const file_entry * file)
-{
-    (void) full_name;
-    (void) file;
-
-    return TRUE;
-}
-
-void
-change_panel (void)
-{
-}
-
-gboolean
-set_zero_dir (dir_list * list)
-{
-    (void) list;
-
-    return TRUE;
-}
-
-void
-load_hint (gboolean force)
-{
-    (void) force;
-}
-
-panel_view_mode_t
-get_display_type (int idx)
-{
-    (void) idx;
-    return view_listing;
-}
-
-panel_view_mode_t
-get_current_type (void)
-{
-    return view_listing;
-}
-
-panel_view_mode_t
-get_other_type (void)
-{
-    return view_listing;
-}
-
-int
-get_current_index (void)
-{
-    return 0;
-}
-
-int
-get_other_index (void)
-{
-    return 1;
-}
-
-int
-unsorted (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_name (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_vers (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_ext (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_time (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_atime (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_ctime (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_size (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-int
-sort_inode (file_entry * a, file_entry * b)
-{
-    (void) a;
-    (void) b;
-
-    return 0;
-}
-
-void
-set_display_type (int num, panel_view_mode_t type)
-{
-    (void) num;
-    (void) type;
-}
-
-void
-copy_cmd_local (void)
-{
-}
-
-void
-delete_cmd_local (void)
-{
-}
-
-void
-view_raw_cmd (void)
-{
-}
-
-void
-edit_cmd_new (void)
-{
-}
-
-void
-rename_cmd_local (void)
-{
-}
-
-void
-select_invert_cmd (void)
-{
-}
-
-void
-unselect_cmd (void)
-{
-}
-
-void
-select_cmd (void)
-{
-}
-
-struct WPanel *
-get_other_panel (void)
-{
-    return NULL;
-}
-
-const panel_field_t *
-sort_box (panel_sort_info_t * info)
-{
-    (void) info;
-
-    return NULL;
-}
-
-void
-midnight_set_buttonbar (WButtonBar * b)
-{
-    (void) b;
-}
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch
deleted file mode 100644
index a200f56b83d5..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d099c36a98110f201195392a8de0aaf289110107 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 21 Jul 2012 15:21:54 +0400
-Subject: [PATCH] Ticket #2851: fixes of ext.d scripts:
-
-  * cleanup of undefined variables;
-  * use proper variables instead of udefine ones.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- misc/ext.d/misc.sh.in |    1 -
- misc/ext.d/package.sh |    3 +--
- misc/ext.d/text.sh.in |    9 ++++-----
- 3 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/misc/ext.d/misc.sh.in b/misc/ext.d/misc.sh.in
-index 53b4821..ea80ced 100644
---- a/misc/ext.d/misc.sh.in
-+++ b/misc/ext.d/misc.sh.in
-@@ -8,7 +8,6 @@ filetype=$2
- 
- do_view_action() {
-     filetype=$1
--    filename=$2
- 
-     case "${filetype}" in
-     iso9660)
-diff --git a/misc/ext.d/package.sh b/misc/ext.d/package.sh
-index 0369d9b..0a28cb7 100644
---- a/misc/ext.d/package.sh
-+++ b/misc/ext.d/package.sh
-@@ -9,7 +9,6 @@ filetype=$2
- 
- do_view_action() {
-     filetype=$1
--    filename=$2
- 
-     case "${filetype}" in
-     trpm)
-@@ -24,7 +23,7 @@ do_view_action() {
-         $RPM -qivlp --scripts "${MC_EXT_FILENAME}"
-         ;;
-     deb)
--        dpkg-deb -I "${filename}" && echo && dpkg-deb -c "${MC_EXT_FILENAME}"
-+        dpkg-deb -I "${MC_EXT_FILENAME}" && echo && dpkg-deb -c "${MC_EXT_FILENAME}"
-         ;;
-     debd)
-         dpkg -s `echo "${MC_EXT_BASENAME}" | sed 's/\([0-9a-z.-]*\).*/\1/'`
-diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in
-index 176cf09..5efd04b 100644
---- a/misc/ext.d/text.sh.in
-+++ b/misc/ext.d/text.sh.in
-@@ -33,7 +33,6 @@ get_unpacker() {
- 
- do_view_action() {
-     filetype=$1
--    pager=$2
- 
-     unpacker=`get_unpacker ${filetype}`
- 
-@@ -60,11 +59,11 @@ do_view_action() {
-     man.gz|man.bz|man.bz2|man.lzma|man.xz)
-         case "${MC_EXT_CURRENTDIR}"/"${MC_EXT_FILENAME}" in
-         */log/*|*/logs/*)
--            ${unpacker} %f
-+            ${unpacker} "${MC_EXT_FILENAME}"
-             ;;
-         *)
--             ${unpacker} ${filename} | nroff @MAN_FLAGS@ @MANDOC@
--             ;;
-+            ${unpacker} "${MC_EXT_FILENAME}" | nroff @MAN_FLAGS@ @MANDOC@
-+            ;;
-         esac
-         ;;
-     *)
-@@ -122,7 +121,7 @@ do_open_action() {
- 
- case "${action}" in
- view)
--    do_view_action "${filetype}" "${pager}"
-+    do_view_action "${filetype}"
-     ;;
- open)
-     xdg-open "${MC_EXT_FILENAME}" 2>/dev/null || \
--- 
-1.7.8.6
-
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
deleted file mode 100644
index a67352d2a6c1..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://www.midnight-commander.org/ticket/2853
-https://www.midnight-commander.org/changeset/972beef6ea2392ab30d755e3421b3dd0b4e2a3df
-
-Index: src/args.c
-===================================================================
---- src/args.c	(revision 23c95d36ac4465627fbc9183e083a8320df77fcf)
-+++ src/args.c	(revision 972beef6ea2392ab30d755e3421b3dd0b4e2a3df)
-@@ -546,5 +546,5 @@
-             else
-             {
--                arg = mcedit_arg_vpath_new (tmp_vpath, 1);
-+                arg = mcedit_arg_vpath_new (tmp_vpath, 0);
-                 vfs_path_free (fname_vpath);
-             }
-@@ -553,5 +553,5 @@
-         }
-         else
--            arg = mcedit_arg_new (tmp, 1);
-+            arg = mcedit_arg_new (tmp, 0);
- 
-         flist = g_list_prepend (flist, arg);
-@@ -559,12 +559,9 @@
- 
-     if (flist == NULL)
--        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 1));
-+        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0));
-     else if (first_line_number != -1)
-     {
-         /* overwrite line number for first file */
-         GList *l;
--
--        if (first_line_number == 0)
--            first_line_number = 1;
- 
-         l = g_list_last (flist);
-@@ -820,5 +817,5 @@
-  *
-  * @param file_name   file name
-- * @param line_number line number
-+ * @param line_number line number. If value is 0, try to restore saved position.
-  * @return mcedit_arg_t object
-  */
-@@ -835,5 +832,5 @@
-  *
-  * @param file_vpath  file path object
-- * @param line_number line number
-+ * @param line_number line number. If value is 0, try to restore saved position.
-  * @return mcedit_arg_t object
-  */
-@@ -846,6 +843,4 @@
-     arg = g_new (mcedit_arg_t, 1);
-     arg->file_vpath = file_vpath;
--    if (line_number == 0)
--        line_number = 1;
-     arg->line_number = line_number;
- 
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch
deleted file mode 100644
index b27088e53775..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2856-aspell-sigsegv.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Reported-by: Lars Wendler (Polynomial-C)
-Gentoo-bug: https://bugs.gentoo.org/429794
-Upstream bug: https://www.midnight-commander.org/ticket/2856
-
-From 105ac777e17859cad4f3e9cf44663a3f98cfe829 Mon Sep 17 00:00:00 2001
-From: Slava Zanko <slavazanko@gmail.com>
-Date: Wed, 25 Jul 2012 16:30:00 +0300
-Subject: [PATCH] Ticket #2856: Fixed mceditor 4.8.4 segfaults when aspell
- dictionaries aren't installed
-
-Steps to reproduce:
- * compile mc with aspell support
- * remove all aspell's dictionaries
- * run mc and try to open any file in the internal editor
- * close the error dialog
- * try to exit from editor
-
-Expected behaviour: a file panels should be shown
-Actual behaviour: the segfault here.
-
-Signed-off-by: Slava Zanko <slavazanko@gmail.com>
----
- src/editor/spell.c |   15 +++++++++------
- 1 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/editor/spell.c b/src/editor/spell.c
-index 73aa9d5..5b4ac6f 100644
---- a/src/editor/spell.c
-+++ b/src/editor/spell.c
-@@ -71,9 +71,7 @@ static struct AspellStringEnumeration *(*mc_aspell_word_list_elements) (const st
-                                                                         * ths);
- static const char *(*mc_aspell_config_retrieve) (struct AspellConfig * ths, const char *key);
- static void (*mc_delete_aspell_speller) (struct AspellSpeller * ths);
--/*
--   static void (*mc_delete_aspell_config) (struct AspellConfig * ths);
-- */
-+static void (*mc_delete_aspell_config) (struct AspellConfig * ths);
- static void (*mc_delete_aspell_can_have_error) (struct AspellCanHaveError * ths);
- static const char *(*mc_aspell_error_message) (const struct AspellCanHaveError * ths);
- static void (*mc_delete_aspell_string_enumeration) (struct AspellStringEnumeration * ths);
-@@ -228,7 +226,7 @@ spell_available (void)
-         (spell_module, "delete_aspell_speller", (void *) &mc_delete_aspell_speller))
-         goto error_ret;
- 
--    if (!g_module_symbol (spell_module, "delete_aspell_config", (void *) &mc_delete_aspell_speller))
-+    if (!g_module_symbol (spell_module, "delete_aspell_config", (void *) &mc_delete_aspell_config))
-         goto error_ret;
- 
-     if (!g_module_symbol (spell_module, "delete_aspell_string_enumeration",
-@@ -311,7 +309,7 @@ aspell_init (void)
-     {
-         edit_error_dialog (_("Error"), mc_aspell_error_message (error));
-         mc_delete_aspell_can_have_error (error);
--        g_free (global_speller);
-+        aspell_clean ();
-     }
- }
- 
-@@ -326,7 +324,12 @@ aspell_clean (void)
-     if (global_speller == NULL)
-         return;
- 
--    mc_delete_aspell_speller (global_speller->speller);
-+    if (global_speller->speller != NULL)
-+        mc_delete_aspell_speller (global_speller->speller);
-+
-+    if (global_speller->config != NULL)
-+        mc_delete_aspell_config (global_speller->config);
-+
-     g_free (global_speller);
-     global_speller = NULL;
- 
--- 
-1.7.8.6
-
diff --git a/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch b/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
deleted file mode 100644
index 748f39c6b13f..000000000000
--- a/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://www.midnight-commander.org/ticket/2858
-https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f
-
-Index: src/filemanager/usermenu.c
-===================================================================
---- src/filemanager/usermenu.c	(revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f)
-+++ src/filemanager/usermenu.c	(revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f)
-@@ -749,6 +749,7 @@
-         return g_strdup ("%");
- 
--    if (mc_global.mc_run_mode == MC_RUN_FULL)
--    {
-+    switch (mc_global.mc_run_mode)
-+    {
-+    case MC_RUN_FULL:
-         if (g_ascii_islower ((gchar) c))
-             panel = current_panel;
-@@ -760,9 +761,16 @@
-         }
-         fname = g_strdup (panel->dir.list[panel->selected].fname);
--    }
-+        break;
-+
- #ifdef USE_INTERNAL_EDIT
--    else if (mc_global.mc_run_mode == MC_RUN_EDITOR)
-+    case MC_RUN_EDITOR:
-         fname = edit_get_file_name (edit_widget);
-+        break;
- #endif
-+
-+    default:
-+        /* other modes don't use formats */
-+        return g_strdup ("");
-+    }
- 
-     if (do_quote)
diff --git a/app-misc/mc/mc-4.8.3-r2.ebuild b/app-misc/mc/mc-4.8.3-r2.ebuild
deleted file mode 100644
index bb55a99138ea..000000000000
--- a/app-misc/mc/mc-4.8.3-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.3-r2.ebuild,v 1.4 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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba +slang test X +xdg"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	cp "${FILESDIR}"/${P}-missing-do_panel_cd_stub_env.c \
-		tests/src/filemanager/do_panel_cd_stub_env.c || die
-
-	# bug #413259
-	epatch "${FILESDIR}"/${P}-fix-chown-crash.patch
-	epatch "${FILESDIR}"/${P}-fix-relative-symlink-creation-crash.patch #413691
-}
-
-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
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.4-r3.ebuild b/app-misc/mc/mc-4.8.4-r3.ebuild
deleted file mode 100644
index e83bfa1b2088..000000000000
--- a/app-misc/mc/mc-4.8.4-r3.ebuild
+++ /dev/null
@@ -1,104 +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.4-r3.ebuild,v 1.1 2012/08/05 17:43:29 slyfox 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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-LANGS="az be bg ca cs da de el eo es et eu fi
-fr gl hu ia id it ja ka ko lt lv mn nb nl pl pt_BR
-pt ro ru sk sl sr sv sv_SE ta tr uk vi wa zh_CN zh_TW"
-#LANGS+=" de_CH fi_FI it_IT" # suspicious overlap
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare() {
-	strip-linguas ${LANGS}
-
-	epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch \
-		"${FILESDIR}"/${P}-Ticket-2853-fileposition-in-mcedit.patch \
-		"${FILESDIR}"/${P}-Ticket-2858-htmlview-segfault.patch \
-		"${FILESDIR}"/${P}-Ticket-2856-aspell-sigsegv.patch
-}
-
-S=${WORKDIR}/${MY_P}
-
-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_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.6.ebuild b/app-misc/mc/mc-4.8.7-r1.ebuild
index 37a454268b92..902b63f36f2d 100644
--- a/app-misc/mc/mc-4.8.6.ebuild
+++ b/app-misc/mc/mc-4.8.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.6.ebuild,v 1.1 2012/09/15 07:33:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.7-r1.ebuild,v 1.1 2013/01/11 11:38:42 polynomial-c Exp $
 
 EAPI=4
 
@@ -83,6 +83,11 @@ src_install() {
 		fowners root:tty /usr/libexec/mc/cons.saver
 		fperms g+s /usr/libexec/mc/cons.saver
 	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index c4885491b844..2045d54a3048 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -10,6 +10,10 @@
     <email>slyfox@gentoo.org</email>
     <name>Sergei Trofimovich</name>
   </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
     <flag name="mclib">Compile and install the libmc.so shared library</flag>