Fix from upstream.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 38 insertions, 9 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index d7c4d8a33a39..363f5b3c0780 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nano
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.82 2005/12/24 06:49:03 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.83 2006/01/11 04:28:56 vapier Exp $
+
+  11 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/nano-1.3.10-disp.patch, nano-1.3.10.ebuild:
+  Fix from upstream.
 
 *nano-1.3.10 (24 Dec 2005)
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index d650958d97e7..561b182dc230 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4285ba95f541dd235531f03deb365d58 ChangeLog 9033
+MD5 c5d52df99907ec391e77af3e015a143a ChangeLog 9158
 MD5 c3684059e73752ce1f114e768ecbaa2b files/1.3.4-nanobrack.patch 557
 MD5 4cf6c77ed7c28d94c8de44d8318176c3 files/1.3.4-nomac.patch 511
 MD5 b075a7a5fe393380c5f00e4efd3146fb files/digest-nano-1.2.5 62
@@ -11,6 +11,7 @@ MD5 b6b8e30beb4e577ac5d8d58bced6b326 files/digest-nano-1.3.6 62
 MD5 959e0d50769b5362d326d0d26809ff02 files/digest-nano-1.3.7 63
 MD5 a5c8733d0235f5a0958b395ad9f44611 files/digest-nano-1.3.8 63
 MD5 babc61f182cc2692e1c4f5689ea30f3e files/digest-nano-1.3.9 63
+MD5 4fd1c712601540686888c2f8e4927ab3 files/nano-1.3.10-disp.patch 659
 MD5 60ac26176596b3e131acc70a327fde01 files/nano-1.3.6-debug-typo.patch 415
 MD5 ebe8f2a4d216c558d080645929ad7176 files/nano-1.3.6-nomac.patch 883
 MD5 7da73db140725a63af026111d6bbc4ff files/nano-1.3.8-display.patch 2328
@@ -19,7 +20,7 @@ MD5 e96987d3e608193dd5a2c0c0122571b5 files/nanorc-gentoo 1864
 MD5 9ecacdb9e41a6ddb3200113238ca4b2b files/nanorc-sh 646
 MD5 b297797b490f7c6ca8d5f40f2d6347cc metadata.xml 1015
 MD5 32ad8dd2260ac44dbbeb2d50e2ed0df6 nano-1.2.5.ebuild 1429
-MD5 ca0f82444982c6b9b3a9e65e0e52e78a nano-1.3.10.ebuild 1874
+MD5 9221a1c204707554b4c05ad03d5042e6 nano-1.3.10.ebuild 1954
 MD5 27bac9f5ff88d92d3386c6854eb29ae4 nano-1.3.4.ebuild 1587
 MD5 6f760844d541acb2dd4c92e22edc5759 nano-1.3.6.ebuild 1755
 MD5 042d14bbc6965489bd62af12f5943519 nano-1.3.7.ebuild 1742
@@ -28,7 +29,7 @@ MD5 192f547ebac299104fef888dafe798dc nano-1.3.9.ebuild 1867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDrO9q2+ySkm8kpY0RAoWGAJ0f2/b22vDhUntWKPWWhwnFgKP1MQCeLWWt
-+WC++bB8DXZvfreib181ZZ8=
-=Mypb
+iD8DBQFDxInk2+ySkm8kpY0RAgHbAKCYCbTRHHWgDKotBtQa2KbsxM4gGACfRo9h
+91SN627j5ABrwt9IEJmC178=
+=ZOFH
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/nano-1.3.10-disp.patch b/app-editors/nano/files/nano-1.3.10-disp.patch
new file mode 100644
index 000000000000..01201c37fd3f
--- /dev/null
+++ b/app-editors/nano/files/nano-1.3.10-disp.patch
@@ -0,0 +1,18 @@
+http://lists.gnu.org/archive/html/nano-devel/2006-01/msg00000.html
+http://lists.gnu.org/archive/html/nano-devel/2006-01/msg00001.html
+
+diff -ur nano-1.3.10/src/winio.c nano-1.3.10-fixed/src/winio.c
+--- nano-1.3.10/src/winio.c	2005-12-08 02:24:54.000000000 -0500
++++ nano-1.3.10-fixed/src/winio.c	2006-01-10 03:10:14.000000000 -0500
+@@ -2772,6 +2772,11 @@
+ 
+ 	openfile->edittop = old_edittop;
+ 
++	/* Update old_current if we're not on the first page and/or
++	 * we're not on the same page as before. */
++	if (do_redraw)
++	    update_line(old_current, 0);
++
+ 	/* Scroll the edit window up or down until edittop is in range
+ 	 * of current. */
+ 	if (nlines < 0)
diff --git a/app-editors/nano/nano-1.3.10.ebuild b/app-editors/nano/nano-1.3.10.ebuild
index b0539862a371..2c0b5361bceb 100644
--- a/app-editors/nano/nano-1.3.10.ebuild
+++ b/app-editors/nano/nano-1.3.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.10.ebuild,v 1.1 2005/12/24 06:49:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.10.ebuild,v 1.2 2006/01/11 04:28:56 vapier Exp $
 
 #ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
 #ECVS_MODULE="nano"
@@ -24,6 +24,12 @@ DEPEND=">=sys-libs/ncurses-5.2
 	!ncurses? ( slang? ( sys-libs/slang ) )"
 PROVIDE="virtual/editor"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-disp.patch
+}
+
 src_compile() {
 	if [[ ! -e configure ]] ; then
 		./autogen.sh || die "autogen failed"