Fix bug 314165, crash in find file results panelization, remove old

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

4 files changed, 24 insertions, 68 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index cf3333acf5d1..85b84efd2717 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.197 2010/04/09 03:51:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.198 2010/04/09 16:25:02 reavertm Exp $
+
+*mc-4.7.1-r2 (09 Apr 2010)
+
+  09 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org> -mc-4.7.1.ebuild,
+  -mc-4.7.1-r1.ebuild, +mc-4.7.1-r2.ebuild,
+  +files/mc-4.7.1_find-results-panelization-crash.patch:
+  Fix bug 314165, crash in find file results panelization, remove old
 
   09 Apr 2010; Jeroen Roovers <jer@gentoo.org> mc-4.7.0.3.ebuild:
   Stable for HPPA (bug #308383).
diff --git a/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch b/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch
new file mode 100644
index 000000000000..09934d2de02b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch
@@ -0,0 +1,11 @@
+Index: src/find.c

+===================================================================

+--- src/find.c (revision 1947d842a5d87c11862039037dc85051448a6081)

++++ src/find.c (revision 7b9226c5da3a81fb758bee70aafe05bb64d37464)

+@@ -1256,5 +1256,5 @@

+ 	    WLEntry *le = (WLEntry *) entry->data;

+ 

+-	    if ((le->text == NULL) || (entry->data == NULL))

++	    if ((le->text == NULL) || (le->data == NULL))

+ 		continue;

+ 

diff --git a/app-misc/mc/mc-4.7.1-r1.ebuild b/app-misc/mc/mc-4.7.1-r2.ebuild
index ff748f440eba..837f7f0b19e1 100644
--- a/app-misc/mc/mc-4.7.1-r1.ebuild
+++ b/app-misc/mc/mc-4.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r1.ebuild,v 1.1 2010/04/08 18:41:06 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.1-r2.ebuild,v 1.1 2010/04/09 16:25:02 reavertm Exp $
 
 EAPI=3
 
@@ -34,7 +34,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}/${PN}-4.7_mcedit_fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7_mcedit_fix.patch"
+	"${FILESDIR}/${PN}-4.7.1_find-results-panelization-crash.patch"
+)
 
 src_configure() {
 	local myscreen=ncurses
diff --git a/app-misc/mc/mc-4.7.1.ebuild b/app-misc/mc/mc-4.7.1.ebuild
deleted file mode 100644
index 5ec248b24dab..000000000000
--- a/app-misc/mc/mc-4.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.1.ebuild,v 1.1 2010/02/26 17:50:41 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}
-
-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"
-}