[app-misc/mc-4.7.0.2-r1] added patches that fix bugs #298997 and #300913

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 123 insertions, 2 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 8f34176efa14..e69a642d23b0 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.187 2010/02/10 04:37:09 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.188 2010/02/10 10:56:14 wired Exp $
+
+*mc-4.7.0.2-r1 (10 Feb 2010)
+
+  10 Feb 2010; Alex Alexander <wired@gentoo.org> +mc-4.7.0.2-r1.ebuild,
+  +files/mc-4.7.0.2_hotlist_fix.patch, +files/mc-4.7.0.2_syntax_fix.patch:
+  added patches that fix bugs #298997 and #300913
 
   10 Feb 2010; Joseph Jezak <josejx@gentoo.org> mc-4.7.0.1.ebuild:
   Marked ppc stable for bug #302733.
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 38a810fef99d..fa5241710093 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,9 @@
+AUX mc-4.7.0.2_hotlist_fix.patch 913 RMD160 344e35fbd503e6fd1f245fe896f4b3c499bdc740 SHA1 857ede6795f9a9c78704c5e6334b3425dc87ea4d SHA256 15775735f244593a3cc9ff49869a91f242226f59bb16649ae484010e5a557dbf
+AUX mc-4.7.0.2_syntax_fix.patch 187 RMD160 393228cf02a9e4d1a600e0cffc51eb05e5e00512 SHA1 760cbb70eae34511e5132289639ebb1449c35a76 SHA256 5b7567e9b293b0598c444640f5272f8c78085f7e6920b5c6182d6c4a9852b933
 DIST mc-4.7.0.1.tar.bz2 2831780 RMD160 15d77153377ea8b11910179e7267d70c2ccc303d SHA1 a5953341eee78c29d84f2c426c082a58516904e5 SHA256 4abb66b20c46c583159b29109282cf0d8cf2c7cc078e6062d914c95e776057c4
 DIST mc-4.7.0.2.tar.bz2 2809115 RMD160 4dc0b546ace58bf7251794c6cfd3fb4d775ad0f1 SHA1 4a193204405e6ec41e705e3eacc3cb54be8401af SHA256 6f23757e1911f6e0e84ce41e53a09b2315576c57c564fccd0b783c4dd5756eb3
 EBUILD mc-4.7.0.1.ebuild 1568 RMD160 3c564132899a4ff40f3d123df2c44f37f587c4c3 SHA1 11e962aad17bdc8cb677f6447cc8093f1c1e0dcd SHA256 2dcabf627f87e257948a6af2b4b4920ffe1f15a3c6c8329554b847e978d9c620
+EBUILD mc-4.7.0.2-r1.ebuild 1724 RMD160 5e499a29a39706b75e9b38252d024558f905d33c SHA1 fe0200a2b8bb97e24eb1f6e828ba1fede8cad922 SHA256 ea61e0b68b4051fa242814bd61675fae3c55b9334c1819df960e1522f9acd304
 EBUILD mc-4.7.0.2.ebuild 1577 RMD160 adff7061c52b1ead6cff72914c8277f2e6fcf47f SHA1 576ce5d0fa34153ecc7eb91779dfa912b05fa28f SHA256 6959e70a58cb638e6b7d0a61105a05fad3dd733ed03907b17d271266d9c3002b
-MISC ChangeLog 25979 RMD160 8004f22f33dd55fd315a658237bd74567aa651ba SHA1 5ee0ec06929f26c8bcc042fcdd41777d632bae1d SHA256 f8e3eb71866e5694929f3daed1be712b82b4d2ae345f840606b4afb5b5de2c70
+MISC ChangeLog 26206 RMD160 2c005b70fd5e36c0d1215b39cc24f44211059126 SHA1 c5fc7773246e3003c2da85a974441ec566d6caf8 SHA256 75a5d95f09dd469ef4d4e6ffbcb44ad2e30fa14372bb1dabef58332e48aeca5f
 MISC metadata.xml 305 RMD160 319f6d3a222a3028d69dfb5ece59f4ae0343125a SHA1 705291c975a8b25ccc5a040d4fa7feab9190048e SHA256 e8245261e4eaebac2b2f5017c36165f9e733bc1e3619392b8f64c0d5392e7cd9
diff --git a/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch b/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch
new file mode 100644
index 000000000000..25bf16110ff5
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch
@@ -0,0 +1,33 @@
+--- a/lib/tty/tty-internal.h
++++ b/lib/tty/tty-internal.h
+@@ -8,4 +8,15 @@
+ 
+ #include "lib/global.h"   /* include <glib.h> */
++
++/* Taken from S-Lang's slutty.c */
++#ifdef ultrix   /* Ultrix gets _POSIX_VDISABLE wrong! */
++# define NULL_VALUE -1
++#else
++# ifdef _POSIX_VDISABLE
++#  define NULL_VALUE _POSIX_VDISABLE
++# else
++#  define NULL_VALUE 255
++# endif
++#endif
+ 
+ /* If true lines are shown by spaces */
+--- a/lib/tty/tty-ncurses.c
++++ b/lib/tty/tty-ncurses.c
+@@ -63,4 +63,5 @@
+ 
+ /*** file scope macro definitions **************************************/
++
+ #if defined(_AIX) && !defined(CTRL)
+ #   define CTRL(x) ((x) & 0x1f)
+@@ -159,4 +160,6 @@
+     /* use Ctrl-g to generate SIGINT */
+     cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */
++    /* disable SIGQUIT to allow use Ctrl-\ key */
++    cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
+     tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
+
diff --git a/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch b/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch
new file mode 100644
index 000000000000..e62faca66c67
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch
@@ -0,0 +1,8 @@
+--- a/misc/syntax/Syntax
++++ b/misc/syntax/Syntax
+@@ -140,5 +140,5 @@
+ include spec.syntax
+ 
+-file ..\*\\.repo$ YUM\sRepo File
++file ..\*\\.repo$ YUM\sRepo\sFile
+ include yum-repo.syntax
diff --git a/app-misc/mc/mc-4.7.0.2-r1.ebuild b/app-misc/mc/mc-4.7.0.2-r1.ebuild
new file mode 100644
index 000000000000..b470f3eb149d
--- /dev/null
+++ b/app-misc/mc/mc-4.7.0.2-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.0.2-r1.ebuild,v 1.1 2010/02/10 10:56:14 wired Exp $
+
+EAPI=2
+
+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"
+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}
+
+# bugs (in patch order): #298997 #300913
+PATCHES=(
+	"${FILESDIR}/${P}_hotlist_fix.patch"
+	"${FILESDIR}/${P}_syntax_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=/etc/samba \
+		--with-codepagedir=/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 ". /usr/libexec/mc/mc.sh"
+}