Added USE=spell to use aspell checker from live ebuild. Fix to view /var/log/*.1.gz files (https://www.midnight-commander.org/ticket/2852). Cleanup old unstable versions.

(Portage version: 2.2.0_alpha118_p1/cvs/Linux x86_64)

14 files changed, 110 insertions, 1015 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 2347ffb569eb..0d439265012a 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,20 @@
 # 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.260 2012/07/21 11:25:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.261 2012/07/21 15:59:49 slyfox Exp $
+
+*mc-4.8.4-r1 (21 Jul 2012)
+
+  21 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch, +mc-4.8.4-r1.ebuild,
+  -files/mc-4.8.0-fix-ftp-spaces.patch, -files/mc-4.8.0-fix-nls.patch,
+  -files/mc-4.8.2-fix-existing.patch,
+  -files/mc-4.8.2-mcedit-without-file-param-fix.patch,
+  -files/mc-4.8.2-missing-do_panel_cd_stub_env.c, -mc-4.7.0.10.ebuild,
+  -mc-4.7.0.3.ebuild, -mc-4.7.5.2.ebuild, -mc-4.7.5.6-r1.ebuild,
+  -mc-4.8.1-r2.ebuild, -mc-4.8.2-r2.ebuild, -mc-4.8.4.ebuild:
+  Added USE=spell to use aspell checker from live ebuild. Fix to view
+  /var/log/*.1.gz files (https://www.midnight-commander.org/ticket/2852).
+  Cleanup old unstable versions.
 
   21 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> mc-9999.ebuild:
   Add USE=spell (uses app-text/aspell as a spell checker).
diff --git a/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch b/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch
deleted file mode 100644
index 8944690261ad..000000000000
--- a/app-misc/mc/files/mc-4.8.0-fix-ftp-spaces.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 95c553c46770f89f09c4408cbdf61ed76b4a8766
-Author: Sergey <sergemp@mail.ru>
-Date:   Thu Oct 20 14:28:39 2011 +0300
-
-    Ticket #2635: mc adds spaces an the beginning of all files/dirs at the ftp server
-    
-    For FTP servers, that do not send ".." in directory listing, mc adds one space to the name of every file and directory. Attached patch should fix this problem.
-    
-    Steps to reproduce:
-    cd /#ftp:ftp.symantec.com
-    
-    Expected result:
-    Correct list of files/directories
-    
-    Actual result:
-    File/directory names with leading spaces
-    
-    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
-
-diff --git a/lib/vfs/parse_ls_vga.c b/lib/vfs/parse_ls_vga.c
-index 8091c14..5424ee9 100644
---- a/lib/vfs/parse_ls_vga.c
-+++ b/lib/vfs/parse_ls_vga.c
-@@ -657,7 +657,7 @@ vfs_split_text (char *p)
- void
- vfs_parse_ls_lga_init (void)
- {
--    vfs_parce_ls_final_num_spaces = 0;
-+    vfs_parce_ls_final_num_spaces = 1;
- }
- 
- /* --------------------------------------------------------------------------------------------- */
diff --git a/app-misc/mc/files/mc-4.8.0-fix-nls.patch b/app-misc/mc/files/mc-4.8.0-fix-nls.patch
deleted file mode 100644
index d77c4cc459fd..000000000000
--- a/app-misc/mc/files/mc-4.8.0-fix-nls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fixes bug found by Nikos Chantziaras
-https://bugs.gentoo.org/show_bug.cgi?id=387949
-Picked from upstream development branch.
-
->  main.c: In function 'main':
->  main.c:384:44: error: expected expression before ';' token
->  main.c:385:29: error: expected expression before ';' token
-
-commit 84320a33d8f9027c70a8d972b69b1ffc824c5a8d
-Author: Andrew Borodin <aborodin@vmail.ru>
-Date:   Thu Oct 20 15:42:15 2011 +0400
-
-    Ticket #????: cleanup.
-    
-    Fixed build with --disable-nls option.
-    
-    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
-
-diff --git a/src/main.c b/src/main.c
-index 9d442f2..e854719 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -381,8 +381,10 @@ main (int argc, char *argv[])
- 
-     /* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */
-     (void) setlocale (LC_ALL, "");
-+#ifdef ENABLE_NLS
-     (void) bindtextdomain ("mc", LOCALEDIR);
-     (void) textdomain ("mc");
-+#endif
- 
-     if (!events_init (&error))
-     {
diff --git a/app-misc/mc/files/mc-4.8.2-fix-existing.patch b/app-misc/mc/files/mc-4.8.2-fix-existing.patch
deleted file mode 100644
index fbb1e6fba3b0..000000000000
--- a/app-misc/mc/files/mc-4.8.2-fix-existing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 2a5885fb7f5ce7af3576fa17ce697adbd9b61567
-Author: Slava Zanko <slavazanko@gmail.com>
-Date:   Fri Mar 23 13:40:25 2012 +0300
-
-    Ticket #2761: save file on top of existing directory changes dir's permissions
-    
-    Steps to reproduce:
-    
-    mkdir foo
-    chmod 0700 foo
-    mcedit bar
-    ls -ld foo
-    drw-r--r-- 1 slyfox users 0 Mar 22 22:10 foo
-    
-    We've lost dir's permissions.
-    
-    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
-
-diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
-index 8e6c9a9..d52e48b 100644
---- a/src/editor/editcmd.c
-+++ b/src/editor/editcmd.c
-@@ -1488,6 +1488,15 @@ edit_save_as_cmd (WEdit * edit)
-             if (vfs_path_cmp (edit->filename_vpath, exp_vpath) != 0)
-             {
-                 int file;
-+                struct stat sb;
-+
-+                if (mc_stat (exp_vpath, &sb) == 0 && !S_ISREG (sb.st_mode))
-+                {
-+                    edit_error_dialog (_("Save as"),
-+                                       get_sys_error (_
-+                                                      ("Cannot save: destination is not a regular file")));
-+                    goto ret;
-+                }
- 
-                 different_filename = 1;
-                 file = mc_open (exp_vpath, O_RDONLY | O_BINARY);
diff --git a/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch b/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch
deleted file mode 100644
index 7252292775a6..000000000000
--- a/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-fixes mcedit not running without a file parameter
-
-https://bugs.gentoo.org/show_bug.cgi?id=409107
-https://www.midnight-commander.org/ticket/2754
-https://www.midnight-commander.org/changeset/529a7ba24c9da9fdb1df939ff0fe35c6d27e65df
-
---- src/filemanager/ext.c
-+++ src/filemanager/ext.c
-@@ -637,4 +637,7 @@
-     int have_type = 0;          /* Flag used by regex_check_type() */
- 
-+    if (filename_vpath == NULL)
-+        return 0;
-+
-     /* Check for the special View:%d parameter */
-     if (strncmp (action, "View:", 5) == 0)
---- src/filemanager/midnight.c
-+++ src/filemanager/midnight.c
-@@ -952,9 +952,11 @@
-     case MC_RUN_EDITOR:
-         {
--            vfs_path_t *param_vpath;
--
--            param_vpath = vfs_path_from_str (mc_run_param0);
--            ret = edit_file (param_vpath, mc_args__edit_start_line);
--            vfs_path_free (param_vpath);
-+            vfs_path_t *vpath = NULL;
-+
-+            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
-+                vpath = vfs_path_from_str (mc_run_param0);
-+
-+            ret = edit_file (vpath, mc_args__edit_start_line);
-+            vfs_path_free (vpath);
-         }
-         break;
-@@ -962,7 +964,9 @@
-     case MC_RUN_VIEWER:
-         {
--            vfs_path_t *vpath;
--
--            vpath = prepend_cwd_on_local (mc_run_param0);
-+            vfs_path_t *vpath = NULL;
-+
-+            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
-+                vpath = prepend_cwd_on_local (mc_run_param0);
-+
-             view_file (vpath, 0, 1);
-             vfs_path_free (vpath);
diff --git a/app-misc/mc/files/mc-4.8.2-missing-do_panel_cd_stub_env.c b/app-misc/mc/files/mc-4.8.2-missing-do_panel_cd_stub_env.c
deleted file mode 100644
index 22fba1543ffd..000000000000
--- a/app-misc/mc/files/mc-4.8.2-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 char *path, dir_list * list, sortfn * sort, gboolean reverse,
-                 gboolean case_sensitive, gboolean exec_ff, const char *fltr)
-{
-    (void) path;
-    (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
new file mode 100644
index 000000000000..a200f56b83d5
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.4-Ticket-2851-fixes-of-ext.d-scripts.patch
@@ -0,0 +1,87 @@
+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/mc-4.7.0.10.ebuild b/app-misc/mc/mc-4.7.0.10.ebuild
deleted file mode 100644
index 7523c0a8963d..000000000000
--- a/app-misc/mc/mc-4.7.0.10.ebuild
+++ /dev/null
@@ -1,71 +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.7.0.10.ebuild,v 1.2 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=3
-
-inherit base
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba slang X"
-
-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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_with samba) \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-
-	# fix bug #334383
-	fowners root:tty /usr/libexec/mc/cons.saver ||
-		die "setting cons.saver's owner failed"
-	fperms g+s /usr/libexec/mc/cons.saver ||
-		die "setting cons.saver's permissions failed"
-}
-
-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.7.0.3.ebuild b/app-misc/mc/mc-4.7.0.3.ebuild
deleted file mode 100644
index 5e103a04900e..000000000000
--- a/app-misc/mc/mc-4.7.0.3.ebuild
+++ /dev/null
@@ -1,65 +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.7.0.3.ebuild,v 1.7 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=3
-
-inherit base
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba slang X"
-
-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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_with samba) \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-}
-
-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.7.5.2.ebuild b/app-misc/mc/mc-4.7.5.2.ebuild
deleted file mode 100644
index 7032cdd7e985..000000000000
--- a/app-misc/mc/mc-4.7.5.2.ebuild
+++ /dev/null
@@ -1,74 +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.7.5.2.ebuild,v 1.9 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=4
-
-inherit base
-
-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.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm +ncurses nls samba slang X"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--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)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's owner failed"
-		fperms g+s /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's permissions failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.7.5.6-r1.ebuild b/app-misc/mc/mc-4.7.5.6-r1.ebuild
deleted file mode 100644
index ae2ae436008e..000000000000
--- a/app-misc/mc/mc-4.7.5.6-r1.ebuild
+++ /dev/null
@@ -1,75 +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.7.5.6-r1.ebuild,v 1.2 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=4
-
-inherit base 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-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm +ncurses nls samba slang X"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	econf \
-		--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)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's owner failed"
-		fperms g+s /usr/libexec/mc/cons.saver ||
-			die "setting cons.saver's permissions failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.1-r2.ebuild b/app-misc/mc/mc-4.8.1-r2.ebuild
deleted file mode 100644
index 43bf76ff79a8..000000000000
--- a/app-misc/mc/mc-4.8.1-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r2.ebuild,v 1.3 2012/05/03 19:41:32 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	ncurses? ( sys-libs/ncurses )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.8.1-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
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--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.2-r2.ebuild b/app-misc/mc/mc-4.8.2-r2.ebuild
deleted file mode 100644
index 01833ed751a9..000000000000
--- a/app-misc/mc/mc-4.8.2-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.2-r2.ebuild,v 1.3 2012/06/01 01:59:55 zmedico Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib 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 409107
-	epatch "${FILESDIR}"/"${P}"-mcedit-without-file-param-fix.patch
-	# bug 409365
-	epatch "${FILESDIR}"/"${P}"-fix-existing.patch
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--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.ebuild b/app-misc/mc/mc-4.8.4-r1.ebuild
index e798a3be30f6..eceb319faa57 100644
--- a/app-misc/mc/mc-4.8.4.ebuild
+++ b/app-misc/mc/mc-4.8.4-r1.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.4.ebuild,v 1.1 2012/07/18 21:58:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.4-r1.ebuild,v 1.1 2012/07/21 15:59:49 slyfox Exp $
 
 EAPI=4
 
@@ -15,7 +15,9 @@ 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 test X +xdg"
+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 )
@@ -24,6 +26,7 @@ RDEPEND=">=dev-libs/glib-2.8:2
 	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
@@ -47,6 +50,8 @@ done
 
 src_prepare() {
 	strip-linguas ${LANGS}
+
+	epatch "${FILESDIR}"/${P}-Ticket-2851-fixes-of-ext.d-scripts.patch
 }
 
 S=${WORKDIR}/${MY_P}
@@ -68,6 +73,7 @@ src_configure() {
 		$(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) \