Version bump. Don't require user to choose from ncurses/slang (bug #353679 by Ulrich Müller and others); use slang by default as less buggy implementation. New release among others fixes crash when ~/.config is not a dir (bug #406315 by Marcin Mirosław).

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

6 files changed, 505 insertions, 12 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index ac3372818aa2..868c66ee958d 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,16 @@
 # 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.247 2012/03/19 18:52:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.248 2012/03/20 19:58:49 slyfox Exp $
+
+*mc-4.8.2 (20 Mar 2012)
+
+  20 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.2-missing-do_panel_cd_stub_env.c, +mc-4.8.2.ebuild,
+  mc-9999.ebuild, metadata.xml:
+  Version bump. Don't require user to choose from ncurses/slang (bug #353679 by
+  Ulrich Müller and others); use slang by default as less buggy implementation.
+  New release among others fixes crash when ~/.config is not a dir (bug #406315
+  by Marcin Mirosław).
 
   19 Mar 2012; Raúl Porcel <armin76@gentoo.org> mc-4.8.1-r1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #401157
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index aee1cd768e3a..a5469ba81a7d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -7,24 +7,27 @@ AUX mc-4.8.1-fix-fallocate-xBSD.patch 944 RMD160 0ec606fcbc4ea4e26f96e413bfc373a
 AUX mc-4.8.1-fix-vfs-test.patch 5593 RMD160 02fabee27661f3479c923d5ace68ebbca55c413b SHA1 eb70e90e5a4e9effde86489a1f33d7aba7096ce8 SHA256 1595a4065b3ff76a11e01b84fd3a7f552373ab00b305de32ab62ed6ebd3f7dd4
 AUX mc-4.8.1-muldefs-in.patch 1963 RMD160 d7093acee4c1d84843c04512f088d4fd8aba7c10 SHA1 9c5dd2fb501df72526559720be215dbadd5a7eb8 SHA256 232f2f0bd12c666a2bee4510a5ac8d15e7cfcc197ffbea12352eda42651fc7bf
 AUX mc-4.8.1-muldefs.patch 1534 RMD160 05f5aca41cac9db155bcad344d22d68c189c42a2 SHA1 9f6e160af4837e0f8c006331bce219829dcf1799 SHA256 6c08488a3047101465066c7513e384e4d4e7a211e64f9e17fe4236f4a66705de
+AUX mc-4.8.2-missing-do_panel_cd_stub_env.c 5448 RMD160 d892fd88563d6a1d21ad075d729307d7830cebfb SHA1 a5742a2fbe4529e5a5bdd0654f4873c714aa4adb SHA256 9338fc4b8c6f48e97c2f604bd07dd7d11d4fd367184c8907758f7ddf85cc6c13
 DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
 DIST mc-4.7.5.2.tar.lzma 1943321 RMD160 8477450d0f2cddc356d93c5006fcfd278966f863 SHA1 fb44d01a80c5e4589aece205adccff5b5a5c34c1 SHA256 ca362c629ea984b635e38e0912ec3a7ceb44facc18f0c17c17d6a114c14e7c26
 DIST mc-4.7.5.6.tar.xz 1995148 RMD160 605169df7f16e006a7889025852056041c4afd93 SHA1 3773da724813e6d93e4178850a03bc0f501f4b12 SHA256 8fc20859eac824b062fb2862429579b75cdbfb8d9011f1a7793d516550af4ffd
 DIST mc-4.8.1.tar.xz 2057960 RMD160 db2d44cffd1e78c1f85a946ebb314542a526d82d SHA1 873b35ebe3f48a661f7d49a988464ac18d40647d SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672
+DIST mc-4.8.2.tar.xz 2037408 RMD160 ccdde662099d0ee4f6caff298030b6cd79806c67 SHA1 06e0426f811416f4b92530898ed2c917a0b626f6 SHA256 f761d5e92d57383819656388f3bb7f998734e474ba943630c6943778e355dc09
 EBUILD mc-4.7.0.10.ebuild 1920 RMD160 8f3ef7092e656e806c7252fdd54f5e8c066316fc SHA1 72710e8c6a105a98071fea1c2402d8b5d16fac38 SHA256 4b63687f1d1ebaefdc17d5bb8e97d0477e495690585950f43f78d844500f4f02
 EBUILD mc-4.7.0.3.ebuild 1706 RMD160 47509be466b4c9cb659cbaee63ac3f4919802b30 SHA1 7e81b7de80a5b28b9f458a25f9c7f4e932a2a155 SHA256 5108770f4b2d507a912a0ec5669dd6d23512afd0b70eadfcc10f7359513f9dbf
 EBUILD mc-4.7.5.2.ebuild 1950 RMD160 1ca9e3bda31808ca7ef6134f4dc0bd1f960dce16 SHA1 bf5bb81a103d5d26f3277020ac474ca278a02779 SHA256 43dead96569eba118d74d4eee7955c291c2e6e07bebed3de7cd146a2fa2a70f5
 EBUILD mc-4.7.5.6-r1.ebuild 2045 RMD160 270e8616950482b443dc4d0d982353511084f871 SHA1 fbd907cfc5a57cc2fb1d9af779f35d369f0c3790 SHA256 93b5a58fb99313f7c395c5b049cf26bfd56a42aedac7bbcdbf0d5d0eddb8edcd
 EBUILD mc-4.8.1-r1.ebuild 2407 RMD160 d3cfbcc14a3bcde7449b1380994bc1943863c54d SHA1 bcdd9e44d882b47a18ab557461a84b1672c7c597 SHA256 cc7c39d41759259dcc79996c57c23fedbdd673e5c637a24a51618a6c3a4167fb
 EBUILD mc-4.8.1-r2.ebuild 2367 RMD160 8ef9c92e9eb37289bbcf82c00291fb2633567cd6 SHA1 69f005824abd578dd8354ba2a785414eff1e2f4e SHA256 7328db03cfaf7e45213a611b7e7b48236a028cadc4c44f58c0d57da9b1d40947
-EBUILD mc-9999.ebuild 2864 RMD160 caee418ddbefc1e7d469137eb5758aae720fe5d7 SHA1 3c426634a1168cc8f6f1b607068181ac270963f3 SHA256 97e3bf45fd98f7c62faa0248203711c4993077a2df911f83fdd5956c02197d7b
-MISC ChangeLog 35445 RMD160 ffc6d24185ba8bb1f07fd2d6d92a60d42792ed6b SHA1 5419c30fde2bbf47c5b6b42cc92bbb291d578d43 SHA256 1ef881cc8e1fc5f56cc9cc82ff79718c5a9d8824be0e11fdeeb5cf54e50da3ed
-MISC metadata.xml 653 RMD160 5c0932709a9e11cef3ac4c95c88b906f688681c5 SHA1 bc2b471e4c49117bccb3dd2b1f9ec00cb24ca5da SHA256 760d390ffdbec152f1220dd02edc067a10243c4f936eed416b52d46a955dd683
+EBUILD mc-4.8.2.ebuild 2189 RMD160 c0d2536760794b19fa17ce029104967580bc6743 SHA1 12b42d1f05a89d46ce3a27683ee75b877fefb35c SHA256 5bf88d4dbb3f458f689176c0039c30b3d9d11ca57b907b8d25f84311b00f8aec
+EBUILD mc-9999.ebuild 2818 RMD160 545d1177af8c5040028b20591e997795d21f02d8 SHA1 fdcb74c3aedeab7ac7778960cca432d9ea54f336 SHA256 7e613f9a317cdda295a300646c0919010e163952d09a127879cbec1c6ec863af
+MISC ChangeLog 35889 RMD160 a68cb85ccee47204b85649eab1bf2a6aa07d3fb7 SHA1 60a92d3cae5565efb35dd646bb8429e7098d25f5 SHA256 ebc26abecc2bbdb21a261bff9f617410f6a9931b499eba7b9f907822c40df63a
+MISC metadata.xml 753 RMD160 411d630a4ac61019ad5154441b0afdbab8d807a2 SHA1 18bdba03c04541cc8294f3f19caeb2ec216a58be SHA256 002f3cef4b01416e6d67722b3784251c37ed8d70583a69f53fb305a64ef30d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9ngGcACgkQuQc30/atMkDRJACfb+elxlv0ml1bfTcM3NcpoICN
-z70An3/bYBSwVEgmhRO6TkZxSQndRf9M
-=NUzm
+iEYEARECAAYFAk9o4pkACgkQcaHudmEf86qRSgCfZ0i9Qdbl2Wk77KYCg7a0yHMt
+Z40An0P8EzP0FnboIInYPaMcatOICa7J
+=sJ5t
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..22fba1543ffd
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.2-missing-do_panel_cd_stub_env.c
@@ -0,0 +1,397 @@
+#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/mc-4.8.2.ebuild b/app-misc/mc/mc-4.8.2.ebuild
new file mode 100644
index 000000000000..512ae9d5836f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.2.ebuild
@@ -0,0 +1,84 @@
+# 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.ebuild,v 1.1 2012/03/20 19:58:49 slyfox Exp $
+
+EAPI=4
+
+inherit 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
+	dev-util/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
+}
+
+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-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index f80284498a32..1bccab9568c1 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.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-9999.ebuild,v 1.4 2012/02/11 19:54:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-9999.ebuild,v 1.5 2012/03/20 19:58:49 slyfox Exp $
 
 EAPI=4
 
@@ -24,16 +24,14 @@ HOMEPAGE="http://www.midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
-
-REQUIRED_USE="^^ ( ncurses slang )"
+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 )
-	ncurses? ( sys-libs/ncurses )
 	samba? ( net-fs/samba )
 	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses )
 	X? ( x11-libs/libX11
 		x11-libs/libICE
 		x11-libs/libXau
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 3334c7cec3d1..33496fe19c5f 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -13,6 +13,7 @@
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
     <flag name="mclib">Compile and install the libmc.so shared library</flag>
+    <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
     <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag>
   </use>
 </pkgmetadata>