Fix wrong charset dialog placement. http://www.midnight-commander.org/ticket/1451.

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

4 files changed, 103 insertions, 2 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index cb9327ec73c3..8095b9c30bbe 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.165 2009/09/01 14:43:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.166 2009/09/04 13:05:24 ssuominen Exp $
+
+*mc-4.7.0_pre2-r1 (04 Sep 2009)
+
+  04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +mc-4.7.0_pre2-r1.ebuild, +files/mc-4.7.0_pre2-horizontal_split.patch:
+  Fix wrong charset dialog placement.
+  http://www.midnight-commander.org/ticket/1451.
 
   01 Sep 2009; Jeroen Roovers <jer@gentoo.org> mc-4.7.0_pre1.ebuild:
   Stable for HPPA (bug #281667).
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 7e763ad2708e..c2e76a8a7aa9 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -11,6 +11,7 @@ AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd
 AUX mc-4.7.0_pre1-ebuild_syntax.patch 1352 RMD160 603d62336c00e85712bfbef03218340f27b00074 SHA1 777a58895a67c6c11b6530129eb13ea5a9647eb0 SHA256 0cdc301345fb324df90827fb0c3e32f144a5babb19cd8b1d5ac673d47b0b8e10
 AUX mc-4.7.0_pre1-tbz2_filetype.patch 564 RMD160 c039c1b8c61c4757b73e61fa5baae5bf9eca2542 SHA1 2db984784143e508348d22d1cb53ed27b83f5e24 SHA256 cfe64f0ed7e7388398c5313026dc432585f6fb386e4be6bd7ec8f881cdedb06c
 AUX mc-4.7.0_pre1-undelfs_configure.patch 757 RMD160 5f5b65c7d5cde6bff56a8cae0e1725c31dc064a2 SHA1 1ce39e2b7ff2a499d8de0ba85fcd346e9518fba0 SHA256 9dbbf46d6dcf694cd2d831ffb127a15d0f39c866ff5e16e6fa4d3fae9be4b5fc
+AUX mc-4.7.0_pre2-horizontal_split.patch 961 RMD160 6bed4129f8b97bdbfb83028e24b40e47c8c61822 SHA1 bad58d4dff35e15e51ca209e14bcd8abce44e2f9 SHA256 011734a2ecfa01ad99f281e577292e42c297421390599e9802bf7b4c22563908
 AUX mc-chdir.sh 76 RMD160 7c9c109d46e432e259acf79fb3291e98898bc194 SHA1 e1adc806de4ec2f1bc053853c68eb0ca7588508e SHA256 8cdac4ed39341373c5b41fdf7dd63c897a1631e7840f084e239445c5992a78e9
 AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9
 AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1
@@ -21,6 +22,7 @@ DIST mc-4.7.0-pre2.tar.bz2 2858435 RMD160 b183a234d5a42a21591422d4fdb087940bae75
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
 EBUILD mc-4.6.1-r4.ebuild 4435 RMD160 3fb4884c84cea9ebc1d25712c5cfd82f4cd32a83 SHA1 8299104edf60b0b62ba8b565a88c003029f0c6b2 SHA256 92a93a2dbf14c086a9a0684f813a7d7b05e58835ba1969bae4b7f8f94aa3f315
 EBUILD mc-4.7.0_pre1.ebuild 1811 RMD160 00b6034c8e4af50b348d92162f25562bf88324b5 SHA1 1cd5080c11045d21cf3557ced60852ff79c238bd SHA256 91f5f37e3f9165d4c7018df175141ea79be60634891d6968af4d20cd57a3dbe8
+EBUILD mc-4.7.0_pre2-r1.ebuild 1645 RMD160 1d3d7bf4090e34e4de575d49eee06ca02974b209 SHA1 9002aff95a94fb3cd1400abfee51f458d82d6bdf SHA256 0a70ac3b6cf33e40fd8833b946c24f49950f292751789344bd239423ced88ac0
 EBUILD mc-4.7.0_pre2.ebuild 1558 RMD160 9be2ebfd884e98282e87b2373019d8699c5bd2f3 SHA1 d9379c02000eaf1a9d0da08534200fb0a9eda514 SHA256 65a8ce6b83be522e59aee3fe70cab39eb161eff44c40018fc1b6c4a5693149d7
-MISC ChangeLog 23389 RMD160 aa8759c4288849bb38a7d24a0ae9584cf11b4980 SHA1 17cfde8abf8b885e3623c3c93dc2186016d740ad SHA256 e3401fc5a55ca215b53d84418d96e6509a8f77afed846267b8dc4bc7bd9718ab
+MISC ChangeLog 23643 RMD160 3c1dd2a66d4556d6a209fe440c649ec72c57095a SHA1 8a16958d9fe9dbbd6400c77a49766789da889dfa SHA256 6fe04bc487d2b47401a2237d1aed61951c6f67d8be0cf093397da4ccbb5e4346
 MISC metadata.xml 423 RMD160 2efdb411affba9683ab491bf079acc785f7b5857 SHA1 678c4e7e2c9488b82b52f0c544ee8306a1305e5d SHA256 e5865811a2bfece6f846866fb7f8991f06dd3f777844e183a6edbd4e01185249
diff --git a/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch b/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch
new file mode 100644
index 000000000000..f1b0f3448721
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/show_bug.cgi?id=282556
+http://www.midnight-commander.org/ticket/1451
+
+diff -ur mc-4.7.0-pre2.orig/src/screen.c mc-4.7.0-pre2/src/screen.c
+--- mc-4.7.0-pre2.orig/src/screen.c	2009-08-23 23:17:14.000000000 +0300
++++ mc-4.7.0-pre2/src/screen.c	2009-09-04 15:59:56.000000000 +0300
+@@ -2702,10 +2702,16 @@
+     char *cd_path;
+ #ifdef HAVE_CHARSET
+     const char *errmsg;
++    int offset;
+     int r;
+-    int width = (panel->widget.x)? panel->widget.cols : panel->widget.cols * (-1);
+ 
+-    r = select_charset (width, 0, source_codepage, FALSE);
++    if (horizontal_split) {
++	offset = (get_current_index () != 0) ? panel->widget.lines : -panel->widget.lines;
++	r = select_charset (0, offset, source_codepage, FALSE);
++    } else {
++	offset = (get_current_index () != 0) ? panel->widget.cols : -panel->widget.cols;
++	r = select_charset (offset, 0, source_codepage, FALSE);
++    }
+ 
+     if (r == SELECT_CHARSET_CANCEL)
+ 	return; /* Cancel */
diff --git a/app-misc/mc/mc-4.7.0_pre2-r1.ebuild b/app-misc/mc/mc-4.7.0_pre2-r1.ebuild
new file mode 100644
index 000000000000..cfd6e1a4e733
--- /dev/null
+++ b/app-misc/mc/mc-4.7.0_pre2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 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_pre2-r1.ebuild,v 1.1 2009/09/04 13:05:24 ssuominen Exp $
+
+EAPI=2
+MY_P=${P/_/-}
+inherit eutils
+
+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="chdir +edit gpm nls samba slang X"
+
+RDEPEND=">=dev-libs/glib-2.6: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_prepare() {
+	epatch "${FILESDIR}"/${P}-horizontal_split.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 "emake install failed"
+	dodoc AUTHORS NEWS README
+
+	if use chdir; then
+		insinto /etc/profile.d
+		doins "${FILESDIR}"/mc-chdir.sh
+	fi
+}