fixed bug #328845

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

3 files changed, 116 insertions, 1 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index c6b0433f73b4..72c82059ac47 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.202 2010/07/09 08:16:06 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.203 2010/07/19 18:43:08 wired Exp $
+
+*mc-4.7.3-r2 (19 Jul 2010)
+
+  19 Jul 2010; Alex Alexander <wired@gentoo.org> +mc-4.7.3-r2.ebuild,
+  +files/mc-4.7.3_copy_move_dialog_to_field_fix.patch:
+  fixed bug #328845
 
 *mc-4.7.3-r1 (09 Jul 2010)
 
diff --git a/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch b/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch
new file mode 100644
index 000000000000..8fd8c88c0cf0
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch
@@ -0,0 +1,37 @@
+Index: src/file.c
+===================================================================
+--- a/src/file.c
++++ b/src/file.c
+@@ -2067,5 +2067,4 @@
+         else
+             dest_dir = panel->cwd;
+-
+         /*
+          * Add trailing backslash only when do non-local ops.
+@@ -2073,20 +2072,14 @@
+          * dir is deleted)
+          */
+-        if (force_single || dest_dir[0] == '\0')
++        if (!force_single && dest_dir[0] != '\0' && dest_dir[strlen (dest_dir) - 1] != PATH_SEP)
++        {
++            /* add trailing separator */
++            dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL);
++        }
++        else
+         {
+             /* just copy */
+             dest_dir_ = g_strdup (dest_dir);
+         }
+-        else if (single_entry)
+-        {
+-            /* add filename to dest path */
+-            dest_dir_ = g_build_filename (dest_dir, source, (char *) NULL);
+-        }
+-        else
+-        {
+-            /* add trailing separator */
+-            dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL);
+-        }
+-
+         if (dest_dir_ == NULL)
+         {
diff --git a/app-misc/mc/mc-4.7.3-r2.ebuild b/app-misc/mc/mc-4.7.3-r2.ebuild
new file mode 100644
index 000000000000..9a5a54daa235
--- /dev/null
+++ b/app-misc/mc/mc-4.7.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.3-r2.ebuild,v 1.1 2010/07/19 18:43:08 wired 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}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+# bug #327573
+PATCHES=(
+	"${FILESDIR}/${P}_advanced_chown_segfault_fix.patch"
+	"${FILESDIR}/${P}_mcedit_quit_dialog_default.patch"
+	"${FILESDIR}/${P}_copy_move_dialog_to_field_fix.patch"
+)
+
+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"
+}