[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Lars Wendler]

commit: 19cf957af44095b7408ea2d3f8366ea653f7557e
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug 12 09:43:39 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug 12 09:43:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19cf957a

app-editors/nano: Removed old

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 app-editors/nano/Manifest  |  1 -
 .../nano-4.8-justify_keystroke_crash_fix.patch | 34 -
 app-editors/nano/nano-4.6-r1.ebuild| 81 --
 3 files changed, 116 deletions(-)

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 43f7d7c47e0..d7e9d135bbd 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,4 +1,3 @@
-DIST nano-4.6.tar.gz 2970798 BLAKE2B 
d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58
 SHA512 
76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B 
a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e
 SHA512 
233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
 DIST nano-5.0.tar.gz 3034734 BLAKE2B 
03ea59c97c0e421ed92f588a2e6991f968b2f341761db66fda077ab827d00b9eb13930f08011f0028010e2005bb912ead723928b482a0532e924f85757a75569
 SHA512 
7e650676a15a185a9695eb49ae5cf441e3d42ae13817a9d3e64cb347c795840712778ac464fd5c578cc6464132206ee06dba52a06a218bcc865485ce3502a4bb
 DIST nano-5.1.tar.gz 2861977 BLAKE2B 
c826782683d26b4c27ffb82e8c4dabad543fe93f53d942bc6ad57b8acb7959595986216a1936d69b0a63b72da101de2c886995421db93c76ee842313799de78d
 SHA512 
8007f40f27a1235d59f5559b6629a3a5a1a579a2356c8825dfef121f4ba7e6c5196e4cedea441c7e856f9add1e9739b14b4142a0a14dab90841110218149df11

diff --git a/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch 
b/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
deleted file mode 100644
index e18425a6b80..000
--- a/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d05ce37c60a157760f386badc387e2d53b2fa75 Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg 
-Date: Thu, 5 Mar 2020 16:57:16 +0100
-Subject: [PATCH] justify: do not crash when the user attempts to justify an
- empty region
-
-This fixes https://savannah.gnu.org/bugs/?57959.
-
-Bug existed since version 4.0, since the justifying
-of a marked region was introduced.

- src/text.c | 6 ++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/text.c b/src/text.c
-index 957938f4..4fe7eb96 100644
 a/src/text.c
-+++ b/src/text.c
-@@ -1930,6 +1930,12 @@ void do_justify(bool full_justify)
-   get_region((const linestruct **)_par_line, _x,
-   (const linestruct **)_par_line, 
_x, _side_up);
- 
-+  /* When the marked region is empty, do nothing. */
-+  if (first_par_line == last_par_line && top_x == bot_x) {
-+  statusline(NOTICE, _("Nothing changed"));
-+  return;
-+  }
-+
-   /* Save the starting point of the marked region. */
-   was_top_lineno = first_par_line->lineno;
-   was_top_x = top_x;
--- 
-2.25.2
-

diff --git a/app-editors/nano/nano-4.6-r1.ebuild 
b/app-editors/nano/nano-4.6-r1.ebuild
deleted file mode 100644
index 28d67f86b94..000
--- a/app-editors/nano/nano-4.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
-   inherit git-r3 autotools
-else
-   MY_P="${PN}-${PV/_}"
-   SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ 
https://wiki.gentoo.org/wiki/Nano/Basics_Guide;
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static 
unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-   sys-libs/ncurses:0=[static-libs(+)]
-   magic? ( sys-apps/file[static-libs(+)] )
-   nls? ( virtual/libintl )
-   !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-   static? 

[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Lars Wendler]

commit: 628aa6e172bda140bb466a32e12508eec70e6766
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 31 08:31:28 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 31 08:38:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628aa6e1

app-editors/nano: Fixed build with USE="minimal" and USE="-spell"

Closes: https://bugs.gentoo.org/734856
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 .../nano-4.9.3-disable-speller_build_fix.patch | 342 +
 .../nano/files/nano-4.9.3-minimal_build_fix.patch  |  46 +++
 app-editors/nano/nano-4.9.3.ebuild |   5 +
 3 files changed, 393 insertions(+)

diff --git a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch 
b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
new file mode 100644
index 000..978e24de805
--- /dev/null
+++ b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
@@ -0,0 +1,342 @@
+From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg 
+Date: Mon, 22 Jun 2020 08:39:59 +0200
+Subject: [PATCH] build: fix compilation when configured with
+ --disable-speller
+
+Move two functions that are used by the formatter too
+to between the proper #ifdef.
+
+Problem existed since commit 8089f5ad from a month ago.
+
+Backported to v4.9.3
+Signed-off-by: Lars Wendler 
+---
+ src/text.c | 302 ++---
+ 1 file changed, 151 insertions(+), 151 deletions(-)
+
+diff --git a/src/text.c b/src/text.c
+index 93ad3704..c7690fd0 100644
+--- a/src/text.c
 b/src/text.c
+@@ -2011,8 +2011,159 @@ void construct_argument_list(char ***arguments, char 
*command, char *filename)
+   (*arguments)[count - 2] = filename;
+   (*arguments)[count - 1] = NULL;
+ }
++
++/* Open the specified file, and if that succeeds, remove the text of the 
marked
++ * region or of the entire buffer and read the file contents into its place. 
*/
++bool replace_buffer(const char *filename, undo_type action, const char 
*operation)
++{
++  linestruct *was_cutbuffer = cutbuffer;
++  int descriptor;
++  FILE *stream;
++
++  descriptor = open_file(filename, FALSE, );
++
++  if (descriptor < 0)
++  return FALSE;
++
++  cutbuffer = NULL;
++
++#ifndef NANO_TINY
++  add_undo(COUPLE_BEGIN, operation);
++
++  /* Cut either the marked region or the whole buffer. */
++  add_undo(action, NULL);
++#endif
++  do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
++#ifndef NANO_TINY
++  update_undo(action);
+ #endif
+ 
++  /* Discard what was cut. */
++  free_lines(cutbuffer);
++  cutbuffer = was_cutbuffer;
++
++  /* Insert the spell-checked file into the cleared area. */
++  read_file(stream, descriptor, filename, TRUE);
++
++#ifndef NANO_TINY
++  add_undo(COUPLE_END, operation);
++#endif
++  return TRUE;
++}
++
++/* Execute the given program, with the given temp file as last argument. */
++const char *treat(char *tempfile_name, char *theprogram, bool spelling)
++{
++  ssize_t lineno_save = openfile->current->lineno;
++  size_t current_x_save = openfile->current_x;
++  size_t pww_save = openfile->placewewant;
++  bool was_at_eol = (openfile->current->data[openfile->current_x] == 
'\0');
++  struct stat fileinfo;
++  long timestamp_sec, timestamp_nsec;
++  static char **arguments = NULL;
++  pid_t thepid;
++  int program_status;
++  bool replaced = FALSE;
++
++  /* Get the timestamp and the size of the temporary file. */
++  stat(tempfile_name, );
++  timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
++  timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
++
++  /* If the number of bytes to check is zero, get out. */
++  if (fileinfo.st_size == 0)
++  return NULL;
++
++  /* Exit from curses mode to give the program control of the terminal. */
++  endwin();
++
++  construct_argument_list(, theprogram, tempfile_name);
++
++  /* Fork a child process and run the given program in it. */
++  if ((thepid = fork()) == 0) {
++  execvp(arguments[0], arguments);
++
++  /* Terminate the child if the program is not found. */
++  exit(9);
++  } else if (thepid < 0)
++  return _("Could not fork");
++
++  /* Block SIGWINCHes while waiting for the program to end,
++   * so nano doesn't get pushed past the wait(). */
++  block_sigwinch(TRUE);
++  wait(_status);
++  block_sigwinch(FALSE);
++
++  /* Restore the terminal state and reenter curses mode. */
++  terminal_init();
++  doupdate();
++
++  if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
++  statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
++  return NULL;
++  } else if 

[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Lars Wendler]

commit: caeb488b475bae6fe7fb261aec8c6ec85d64382b
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 27 08:22:34 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 27 08:22:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caeb488b

app-editors/nano: Revbump to fix justify keystroke crash

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 .../nano-4.8-justify_keystroke_crash_fix.patch | 34 ++
 .../nano/{nano-4.6.ebuild => nano-4.6-r1.ebuild}   |  1 +
 2 files changed, 35 insertions(+)

diff --git a/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch 
b/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
new file mode 100644
index 000..e18425a6b80
--- /dev/null
+++ b/app-editors/nano/files/nano-4.8-justify_keystroke_crash_fix.patch
@@ -0,0 +1,34 @@
+From 2d05ce37c60a157760f386badc387e2d53b2fa75 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg 
+Date: Thu, 5 Mar 2020 16:57:16 +0100
+Subject: [PATCH] justify: do not crash when the user attempts to justify an
+ empty region
+
+This fixes https://savannah.gnu.org/bugs/?57959.
+
+Bug existed since version 4.0, since the justifying
+of a marked region was introduced.
+---
+ src/text.c | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/text.c b/src/text.c
+index 957938f4..4fe7eb96 100644
+--- a/src/text.c
 b/src/text.c
+@@ -1930,6 +1930,12 @@ void do_justify(bool full_justify)
+   get_region((const linestruct **)_par_line, _x,
+   (const linestruct **)_par_line, 
_x, _side_up);
+ 
++  /* When the marked region is empty, do nothing. */
++  if (first_par_line == last_par_line && top_x == bot_x) {
++  statusline(NOTICE, _("Nothing changed"));
++  return;
++  }
++
+   /* Save the starting point of the marked region. */
+   was_top_lineno = first_par_line->lineno;
+   was_top_x = top_x;
+-- 
+2.25.2
+

diff --git a/app-editors/nano/nano-4.6.ebuild 
b/app-editors/nano/nano-4.6-r1.ebuild
similarity index 96%
rename from app-editors/nano/nano-4.6.ebuild
rename to app-editors/nano/nano-4.6-r1.ebuild
index 18a962cba39..0f93288e883 100644
--- a/app-editors/nano/nano-4.6.ebuild
+++ b/app-editors/nano/nano-4.6-r1.ebuild
@@ -32,6 +32,7 @@ BDEPEND="
nls? ( sys-devel/gettext )
virtual/pkgconfig
 "
+PATCHES=( "${FILESDIR}/${PN}-4.8-justify_keystroke_crash_fix.patch" )
 src_prepare() {
default
if [[ ${PV} == "" ]] ; then

[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Lars Wendler]

commit: a5774d47a8ed447e046f613064e057c835f66191
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr  1 15:12:38 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr  1 15:13:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5774d47

app-editors/nano: Revbump to apply upstream fix. Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/nano-4.0-variable_initialization.patch   | 39 ++
 .../nano/{nano-4.0.ebuild => nano-4.0-r1.ebuild}   |  5 +++
 2 files changed, 44 insertions(+)

diff --git a/app-editors/nano/files/nano-4.0-variable_initialization.patch 
b/app-editors/nano/files/nano-4.0-variable_initialization.patch
new file mode 100644
index 000..c72122ed703
--- /dev/null
+++ b/app-editors/nano/files/nano-4.0-variable_initialization.patch
@@ -0,0 +1,39 @@
+From 7ad232d71470cd8c4dc63aeb02f11c9e8df9ecdb Mon Sep 17 00:00:00 2001
+From: Devin Hussey 
+Date: Thu, 28 Mar 2019 17:28:47 -0400
+Subject: [PATCH] files: initialize a variable before referencing it
+
+The lack of initialization caused a nasty bug on some targets (such as
+ARMv7) which would make it so that ^S would just say "Cancelled".
+
+While x86 (both 64 and 32 bits) seems to initialize 'response' to zero or
+a positive number, ARM does not, and there is usually a negative value in
+its place, which triggers the 'if (response < 0)' check and, as a result,
+the code says "Cancelled".
+
+This fixes https://savannah.gnu.org/bugs/?56023.
+Reported-by: Devin Hussey 
+
+Bug existed since version 4.0, commit 0f9d60a3.
+
+Signed-off-by: Devin Hussey 
+---
+ src/files.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/files.c b/src/files.c
+index 84e3f684..fd54c168 100644
+--- a/src/files.c
 b/src/files.c
+@@ -2101,7 +2101,7 @@ int do_writeout(bool exiting, bool withprompt)
+ 
+   while (TRUE) {
+   const char *msg;
+-  int response, choice;
++  int response = 0, choice = 0;
+   functionptrtype func;
+ #ifndef NANO_TINY
+   const char *formatstr, *backupstr;
+-- 
+2.20.1
+

diff --git a/app-editors/nano/nano-4.0.ebuild 
b/app-editors/nano/nano-4.0-r1.ebuild
similarity index 97%
rename from app-editors/nano/nano-4.0.ebuild
rename to app-editors/nano/nano-4.0-r1.ebuild
index aa130516a9a..05e4012530b 100644
--- a/app-editors/nano/nano-4.0.ebuild
+++ b/app-editors/nano/nano-4.0-r1.ebuild
@@ -32,6 +32,11 @@ BDEPEND="
nls? ( sys-devel/gettext )
virtual/pkgconfig
 "
+
+PATCHES=(
+   "${FILESDIR}/${P}-variable_initialization.patch"
+)
+
 src_prepare() {
default
if [[ ${PV} == "" ]] ; then

[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Lars Wendler]

commit: 45eaa6b8e646f975e9efdab763c87142a03a5c34
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 14 07:36:15 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 14 07:36:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45eaa6b8

app-editors/nano: Revbump to fix misbinding with upstream patch.

Removed old.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-editors/nano/files/nano-3.0-misbinding.patch   | 46 ++
 .../nano/{nano-3.0.ebuild => nano-3.0-r1.ebuild}   |  4 ++
 2 files changed, 50 insertions(+)

diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch 
b/app-editors/nano/files/nano-3.0-misbinding.patch
new file mode 100644
index 000..2312edcff06
--- /dev/null
+++ b/app-editors/nano/files/nano-3.0-misbinding.patch
@@ -0,0 +1,46 @@
+From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg 
+Date: Wed, 12 Sep 2018 13:18:17 +0200
+Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't
+ use KEY_BSP
+
+When curses gives no code for Ctrl+Shift+Delete, do not fall back
+to KEY_BACKSPACE, because then ^H and/or  get bound to
+'cutwordleft'.
+
+This fixes https://savannah.gnu.org/bugs/?54642.
+
+Bug was introduced with version 3.0, commit e6429e78.
+---
+ src/nano.c | 2 +-
+ src/nano.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index c7e0ca2d..74e12439 100644
+--- a/src/nano.c
 b/src/nano.c
+@@ -2580,7 +2580,7 @@ int main(int argc, char **argv)
+   controlhome = get_keycode("kHOM5", CONTROL_HOME);
+   controlend = get_keycode("kEND5", CONTROL_END);
+   controldelete = get_keycode("kDC5", CONTROL_DELETE);
+-  controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE);
++  controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
+ #ifndef NANO_TINY
+   /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
+   shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
+diff --git a/src/nano.h b/src/nano.h
+index e1042759..7de34bf3 100644
+--- a/src/nano.h
 b/src/nano.h
+@@ -588,6 +588,7 @@ enum
+ #define SHIFT_CONTROL_DOWN 0x414
+ #define SHIFT_CONTROL_HOME 0x415
+ #define SHIFT_CONTROL_END 0x416
++#define CONTROL_SHIFT_DELETE 0x417
+ #define ALT_LEFT 0x421
+ #define ALT_RIGHT 0x422
+ #define ALT_UP 0x423
+-- 
+2.17.1
+

diff --git a/app-editors/nano/nano-3.0.ebuild 
b/app-editors/nano/nano-3.0-r1.ebuild
similarity index 97%
rename from app-editors/nano/nano-3.0.ebuild
rename to app-editors/nano/nano-3.0-r1.ebuild
index 4d2b8d0818e..44b716308be 100644
--- a/app-editors/nano/nano-3.0.ebuild
+++ b/app-editors/nano/nano-3.0-r1.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-misbinding.patch
+)
+
 src_prepare() {
default
if [[ ${PV} == "" ]] ; then

[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Lars Wendler]

commit: a85bdb42ac21f9adb2ed7b71c6257fbf8a2f60e6
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep  2 00:23:06 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep  2 00:23:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85bdb42

app-editors/nano: Fixed build with USE="minimal" (bug #629510).

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../files/nano-2.8.7-minimal_compile_fix.patch | 38 ++
 app-editors/nano/nano-2.8.7.ebuild |  6 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch 
b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
new file mode 100644
index 000..ef8d7491016
--- /dev/null
+++ b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
@@ -0,0 +1,38 @@
+From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg 
+Date: Tue, 29 Aug 2017 19:28:44 +0200
+Subject: tweaks: fix compilation when configured with --enable-tiny
+
+When moving the cursor to the top-left corner, it is not necessary
+to compute leftedge because firstcolumn IS the relevant leftedge.
+
+Reported-by: Jordi Mallach 
+---
+ src/move.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/move.c b/src/move.c
+index d138356..ce276e4 100644
+--- a/src/move.c
 b/src/move.c
+@@ -121,7 +121,7 @@ void do_page_up(void)
+   openfile->current = openfile->edittop;
+   openfile->current_y = 0;
+ 
+-  leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
++  leftedge = openfile->firstcolumn;
+   target_column = 0;
+ } else
+   get_edge_and_target(, _column);
+@@ -152,7 +152,7 @@ void do_page_down(void)
+   openfile->current = openfile->edittop;
+   openfile->current_y = 0;
+ 
+-  leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
++  leftedge = openfile->firstcolumn;
+   target_column = 0;
+ } else
+   get_edge_and_target(, _column);
+-- 
+cgit v1.0-41-gc330
+

diff --git a/app-editors/nano/nano-2.8.7.ebuild 
b/app-editors/nano/nano-2.8.7.ebuild
index 4463df57a3e..49a313cd193 100644
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ b/app-editors/nano/nano-2.8.7.ebuild
@@ -31,11 +31,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+   "${FILESDIR}/${P}-minimal_compile_fix.patch" #629510
+)
+
 src_prepare() {
+   default
if [[ ${PV} == "" ]] ; then
eautoreconf
fi
-   default
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/

[Manuel Rüger]

commit: e31ae64ca383c64789a8078e535628f118a7933d
Author: Manuel Rüger mrueg AT gentoo DOT org
AuthorDate: Fri Aug 28 02:20:29 2015 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Fri Aug 28 02:23:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31ae64c

app-editors/nano: Remove old

Package-Manager: portage-2.2.20.1

 app-editors/nano/Manifest  |   8 -
 app-editors/nano/files/nano-1.3.12-fix2.patch  |  15 --
 app-editors/nano/files/nano-1.3.12-path.patch  | 199 -
 app-editors/nano/files/nano-1.3.12-scroll.patch|  39 
 .../nano/files/nano-2.3.1-bind-unbind-docs.patch   | 118 
 .../nano/files/nano-2.3.1-drop-target.patch|  30 
 .../nano/files/nano-2.3.1-gentoo-nanorc.patch  |  95 --
 .../nano/files/nano-2.3.1-ncurses-pkg-config.patch |  52 --
 .../nano/files/nano-2.3.1-shell-nanorc.patch   |  44 -
 .../nano/files/nano-2.3.2-bind-unbind-docs.patch   | 119 
 app-editors/nano/nano-1.3.12-r1.ebuild |  80 -
 app-editors/nano/nano-2.0.9.ebuild |  79 
 app-editors/nano/nano-2.1.10.ebuild|  84 -
 app-editors/nano/nano-2.2.5.ebuild |  84 -
 app-editors/nano/nano-2.3.1-r1.ebuild  |  71 
 app-editors/nano/nano-2.3.1-r2.ebuild  |  68 ---
 app-editors/nano/nano-2.3.1.ebuild |  77 
 app-editors/nano/nano-2.3.2-r1.ebuild  |  79 
 app-editors/nano/nano-2.3.2.ebuild |  72 
 app-editors/nano/nano-2.3.3.ebuild |  76 
 app-editors/nano/nano-2.3.4.ebuild |  76 
 21 files changed, 1565 deletions(-)

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 65e6438..91061a0 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,11 +1,3 @@
-DIST nano-1.3.12.tar.gz 1250777 SHA256 
f5537b8a988618fa8524b6a4b0a6950184d37db983b4521ad843b98845da571c SHA512 
30d95122486e13159c4e36d4408ab977351d0d46bb28e21b0e867ab6246a3a5a51d987fcca956d66d629753698188bffec34f076a1cf505cbadd6bec4cd54afb
 WHIRLPOOL 
a2ef9482ade321ffc231e5bc0429a363389049ab4fbb82f74719003ca3446681805fbcf8c78dd6fad62c0363030e9804f649b297a7c6840fff83148cb031c7d1
-DIST nano-2.0.9.tar.gz 1403773 SHA256 
6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f SHA512 
9090dc005670998db2d10657e8c37751051a71ea4a6ba514d1c8e36d5d5030c778ede5d2c3734106a92e100e3755add828f3094b3b5c2b41def8e15e674e4907
 WHIRLPOOL 
4d16cb2c684bf34f441096311778b9249243cc84351af7586ff1bd7c0fb251548a1fc987cb91a08633b49fb0841e97d3ca79e8392b8f0ff2e12560b2b098
-DIST nano-2.1.10.tar.gz 1478204 SHA256 
03af11adace9f6c482a06f5304c5aba5d134972a416ce4368307b604420b2e40 SHA512 
647174879abb0658776e9f3c6734db0989cfe1cb445bda616997d24e2955f7df790bf1c6b7d8dd3fe4878c73d589d84c6c1acae6b851dbf6ab623f0992cf284e
 WHIRLPOOL 
8b813d18c9b2d94c1ec11377f9b7467e18a0fd9d425fe84d9209f6a6c4192bbdd1377f78306c489830a563f4aba0962bfd7349086e59cd12fed6ea96ea67531a
-DIST nano-2.2.5.tar.gz 1554750 SHA256 
9015945d1badabbada203b37c4779d3dd1066234235c714deb439989c5cd7d9e SHA512 
5dd9bd1bccb8ab5c6592310e2e6cee5a59370595ab1ce2065f0d77a6eb58d8e115559a00b17582ccc6321dcd93a557af391e716977d3ce86f99d83b1aad648fc
 WHIRLPOOL 
b2b65c589dc4bfc665e3f73a6fa6bfecfc6bae0d68d99a43ec392fd625717b9e3792b868d84fece44622e245c15c8f20d0c97aa129813319327c42cc89fc96c3
-DIST nano-2.3.1.tar.gz 1624332 SHA256 
b7bace9a8e543b84736d6ef5ce5430305746efea3aacb24391f692efc6f3c8d3 SHA512 
ab8e17f712c0609e5e7e7caeec79c4bb28d1d6e1c837d2a9c2e7a691156f58c6770375d8c410898648a3629a38cf6b3bb2de9a6c02556e62a583c0500a1aec94
 WHIRLPOOL 
ea14ce055f41884956ad5de5e763396522b9f63c8fd64720078f11c1c97e0fbc6f760789fc52bd3f485d1856dda2727899fb8e79cae3c87850ba0ad8793b1a4d
-DIST nano-2.3.2.tar.gz 1725485 SHA256 
ff309248071486445609ad4269b798262a1324d7503dc09dea289f5b60106be8 SHA512 
c4bf4a152e797e860e9f8aee5091b8e380f5305d3457d5503c2b6187897394510dd756948cce7157fe986bbb9db7a5b98c9cb5794d12cf6399d7e96e0db1be49
 WHIRLPOOL 
48111c18a50ab5215646b0a85a6f90a55274d349890fee54e18a66028b1b5a79f51c6f2f12a039751342845b3c8e5f58854e3368d7f8f18c1ab94d6f56f40b02
-DIST nano-2.3.3.tar.gz 1812671 SHA256 
d80e0fce656b5cd2f327ea599c708c897dc1b8c608e87c756d63c79e97e8cc19 SHA512 
542a12ac7dd8bd48b69e7c3c4850b5757372c0abb2082f12ca049a5857137ef93a7225ca9f23b8aaa934c639c2c1c1d54ae40da868b7c4adf3b3cfc9dec16a95
 WHIRLPOOL 
a9b7c9d2f2904e588f0847d2b897649e780ca489c1240da49a5afdabf10c588191c8cbd3a6360409a26e24ad5604cb12172bb9680200e3edbad2bd94cb5fc3ca
-DIST nano-2.3.4.tar.gz 1812943 SHA256 
1774129f4b933df5dbfdf45c4ecdbfc19eb6ff8c2fc6ad43c7f392aa7cd998c1 SHA512 
5f0e3d170cce60a6b20647607745373727700fbb59d579ce5f62fd5915568ef0065f5e0e2923812a321dd3b13c77ab9231fd62f7b2a86965925d1da675fa646b
 WHIRLPOOL