* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2017-09-02 0:23 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2017-09-02 0:23 UTC (permalink / raw
To: gentoo-commits
commit: a85bdb42ac21f9adb2ed7b71c6257fbf8a2f60e6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 00:23:06 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 00:23:21 2017 +0000
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 00000000000..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 <bensberg@telfort.nl>
+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 <jordi@debian.org>
+---
+ 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(&leftedge, &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(&leftedge, &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} == "9999" ]] ; then
eautoreconf
fi
- default
}
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2020-08-12 9:43 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-08-12 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 19cf957af44095b7408ea2d3f8366ea653f7557e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 09:43:39 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 09:43:48 2020 +0000
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 <polynomial-c <AT> 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..00000000000
--- 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 <bensberg@telfort.nl>
-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 **)&first_par_line, &top_x,
- (const linestruct **)&last_par_line, &bot_x, &right_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..00000000000
--- 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} == "9999" ]] ; 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? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${PN}-4.8-justify_keystroke_crash_fix.patch" )
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2020-07-31 8:38 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-07-31 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 628aa6e172bda140bb466a32e12508eec70e6766
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 08:31:28 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 08:38:07 2020 +0000
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 <polynomial-c <AT> 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 00000000000..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 <bensberg@telfort.nl>
+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 <polynomial-c@gentoo.org>
+---
+ 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, &stream);
++
++ 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, &fileinfo);
++ 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(&arguments, 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(&program_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 (WEXITSTATUS(program_status) != 0)
++ statusline(ALERT, _("Program '%s' complained"), arguments[0]);
++
++ /* Stat the temporary file again. */
++ stat(tempfile_name, &fileinfo);
++
++ /* When the temporary file wasn't touched, say so and leave. */
++ if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
++ (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
++ statusbar(_("Nothing changed"));
++ return NULL;
++ }
++
++#ifndef NANO_TINY
++ /* Replace the marked text (or entire text) with the corrected text. */
++ if (spelling && openfile->mark) {
++ ssize_t was_mark_lineno = openfile->mark->lineno;
++ bool upright = mark_is_before_cursor();
++
++ replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
++
++ /* Adjust the end point of the marked region for any change in
++ * length of the region's last line. */
++ if (upright)
++ current_x_save = openfile->current_x;
++ else
++ openfile->mark_x = openfile->current_x;
++
++ /* Restore the mark. */
++ openfile->mark = line_from_number(was_mark_lineno);
++ } else
++#endif
++ {
++ openfile->current = openfile->filetop;
++ openfile->current_x = 0;
++
++ replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
++ /* TRANSLATORS: The next two go with Undid/Redid messages. */
++ (spelling ? N_("spelling correction") : N_("formatting")));
++ }
++
++ /* Go back to the old position. */
++ goto_line_posx(lineno_save, current_x_save);
++ if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
++ openfile->current_x = strlen(openfile->current->data);
++
++#ifndef NANO_TINY
++ if (replaced)
++ update_undo(COUPLE_END);
++#endif
++
++ openfile->placewewant = pww_save;
++ adjust_viewport(STATIONARY);
++
++ if (spelling)
++ statusbar(_("Finished checking spelling"));
++ else
++ statusbar(_("Buffer has been processed"));
++
++ return NULL;
++}
++#endif /* ENABLE_SPELLER || ENABLE_COLOR */
++
+ #ifdef ENABLE_SPELLER
+ /* Let the user edit the misspelled word. Return FALSE if the user cancels. */
+ bool fix_spello(const char *word)
+@@ -2307,157 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
+ return 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, &stream);
+-
+- 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, &fileinfo);
+- 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(&arguments, 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(&program_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 (WEXITSTATUS(program_status) != 0)
+- statusline(ALERT, _("Program '%s' complained"), arguments[0]);
+-
+- /* Stat the temporary file again. */
+- stat(tempfile_name, &fileinfo);
+-
+- /* When the temporary file wasn't touched, say so and leave. */
+- if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
+- (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
+- statusbar(_("Nothing changed"));
+- return NULL;
+- }
+-
+-#ifndef NANO_TINY
+- /* Replace the marked text (or entire text) with the corrected text. */
+- if (spelling && openfile->mark) {
+- ssize_t was_mark_lineno = openfile->mark->lineno;
+- bool upright = mark_is_before_cursor();
+-
+- replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
+-
+- /* Adjust the end point of the marked region for any change in
+- * length of the region's last line. */
+- if (upright)
+- current_x_save = openfile->current_x;
+- else
+- openfile->mark_x = openfile->current_x;
+-
+- /* Restore the mark. */
+- openfile->mark = line_from_number(was_mark_lineno);
+- } else
+-#endif
+- {
+- openfile->current = openfile->filetop;
+- openfile->current_x = 0;
+-
+- replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
+- /* TRANSLATORS: The next two go with Undid/Redid messages. */
+- (spelling ? N_("spelling correction") : N_("formatting")));
+- }
+-
+- /* Go back to the old position. */
+- goto_line_posx(lineno_save, current_x_save);
+- if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
+- openfile->current_x = strlen(openfile->current->data);
+-
+-#ifndef NANO_TINY
+- if (replaced)
+- update_undo(COUPLE_END);
+-#endif
+-
+- openfile->placewewant = pww_save;
+- adjust_viewport(STATIONARY);
+-
+- if (spelling)
+- statusbar(_("Finished checking spelling"));
+- else
+- statusbar(_("Buffer has been processed"));
+-
+- return NULL;
+-}
+-
+ /* Spell check the current file. If an alternate spell checker is
+ * specified, use it. Otherwise, use the internal spell checker. */
+ void do_spell(void)
+--
+2.28.0
+
diff --git a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
new file mode 100644
index 00000000000..52112bab723
--- /dev/null
+++ b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
@@ -0,0 +1,46 @@
+From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Mon, 22 Jun 2020 14:00:23 +0200
+Subject: [PATCH] build: fix compilation for --enable-tiny --enable-color
+ --enable-nanorc
+
+Backported to v4.9.3
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/nano.c | 2 +-
+ src/text.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index be80a073..3ac81ba4 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -1079,7 +1079,7 @@ RETSIGTYPE do_continue(int signal)
+ ungetch(KEY_FLUSH);
+ }
+
+-#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
++#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)
+ /* Block or unblock the SIGWINCH signal, depending on the blockit parameter. */
+ void block_sigwinch(bool blockit)
+ {
+diff --git a/src/text.c b/src/text.c
+index c7690fd0..32727946 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -2032,10 +2032,10 @@ bool replace_buffer(const char *filename, undo_type action, const char *operatio
+
+ /* 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);
++#else
++ do_snip(FALSE, TRUE, FALSE, FALSE);
+ #endif
+
+ /* Discard what was cut. */
+--
+2.28.0
+
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index 076c22b9c60..bd791de7db4 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -32,6 +32,11 @@ BDEPEND="
nls? ( sys-devel/gettext )
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${P}-disable-speller_build_fix.patch"
+ "${FILESDIR}/${P}-minimal_build_fix.patch" #734856
+)
+
src_prepare() {
default
if [[ ${PV} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2020-03-27 8:22 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-03-27 8:22 UTC (permalink / raw
To: gentoo-commits
commit: caeb488b475bae6fe7fb261aec8c6ec85d64382b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 08:22:34 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 08:22:44 2020 +0000
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 <polynomial-c <AT> 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 00000000000..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 <bensberg@telfort.nl>
+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 **)&first_par_line, &top_x,
+ (const linestruct **)&last_par_line, &bot_x, &right_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} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2019-04-01 15:13 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-04-01 15:13 UTC (permalink / raw
To: gentoo-commits
commit: a5774d47a8ed447e046f613064e057c835f66191
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 15:12:38 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 15:13:17 2019 +0000
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 <polynomial-c <AT> 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 00000000000..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 <husseydevin@gmail.com>
+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 <husseydevin@gmail.com>
+
+Bug existed since version 4.0, commit 0f9d60a3.
+
+Signed-off-by: Devin Hussey <husseydevin@gmail.com>
+---
+ 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} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2018-09-14 7:37 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-09-14 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 45eaa6b8e646f975e9efdab763c87142a03a5c34
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 07:36:15 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 07:36:56 2018 +0000
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 00000000000..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 <bensberg@telfort.nl>
+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 <Backspace> 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} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2017-02-18 18:57 Mike Frysinger
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger @ 2017-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 5c19e1befd6f45fb1cf63b148db7e0cf87ac6e7b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 18:57:10 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 18:57:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c19e1be
app-editors/nano: add upstream fix for USE=minimal build #591026
app-editors/nano/files/nano-2.6.3-minimal.patch | 97 +++++++++++++++++++++++++
app-editors/nano/nano-2.6.3.ebuild | 1 +
2 files changed, 98 insertions(+)
diff --git a/app-editors/nano/files/nano-2.6.3-minimal.patch b/app-editors/nano/files/nano-2.6.3-minimal.patch
new file mode 100644
index 0000000000..7e5387e3d7
--- /dev/null
+++ b/app-editors/nano/files/nano-2.6.3-minimal.patch
@@ -0,0 +1,97 @@
+https://bugs.gentoo.org/591026
+
+From 928a24c20444a652212e544a506ed55c44efdf3b Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@justemail.net>
+Date: Thu, 11 Aug 2016 12:37:11 +0200
+Subject: [PATCH] input: look at the modifier keys only when compiled on Linux
+
+This fixes https://savannah.gnu.org/bugs/?48751 reported by Andrew Ho.
+
+This also fixes compilation when configured with --enable-tiny.
+---
+ src/global.c | 3 +++
+ src/nano.c | 3 ++-
+ src/proto.h | 3 +++
+ src/winio.c | 4 ++++
+ 4 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/global.c b/src/global.c
+index 69c66473508d..3347476f1afb 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -33,8 +33,11 @@ volatile sig_atomic_t sigwinch_counter = 0;
+ /* Is incremented by the handler whenever a SIGWINCH occurs. */
+ #endif
+
++#if defined(__linux__) && !defined(NANO_TINY)
+ bool console;
+ /* Whether we're running on a Linux VC (TRUE) or under X (FALSE). */
++#endif
++
+ bool meta_key;
+ /* Whether the current keystroke is a Meta key. */
+ bool focusing = TRUE;
+diff --git a/src/nano.c b/src/nano.c
+index 6e55f4948346..4d82c938628c 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -2482,9 +2482,10 @@ int main(int argc, char **argv)
+ /* Set up the terminal state. */
+ terminal_init();
+
++#if defined(__linux__) && !defined(NANO_TINY)
+ /* Check whether we're running on a Linux console. */
+ console = (getenv("DISPLAY") == NULL);
+-
++#endif
+ #ifdef DEBUG
+ fprintf(stderr, "Main: set up windows\n");
+ #endif
+diff --git a/src/proto.h b/src/proto.h
+index 6396f3735127..4f6624ea0f16 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -30,7 +30,10 @@
+ extern volatile sig_atomic_t sigwinch_counter;
+ #endif
+
++#if defined(__linux__) && !defined(NANO_TINY)
+ extern bool console;
++#endif
++
+ extern bool meta_key;
+ extern bool focusing;
+
+diff --git a/src/winio.c b/src/winio.c
+index bcfb8a2adf3f..1f31195af5d3 100644
+--- a/src/winio.c
++++ b/src/winio.c
+@@ -23,7 +23,9 @@
+ #include "proto.h"
+ #include "revision.h"
+
++#if defined(__linux__) && !defined(NANO_TINY)
+ #include <sys/ioctl.h>
++#endif
+
+ #include <stdio.h>
+ #include <stdarg.h>
+@@ -504,6 +506,7 @@ int parse_kbinput(WINDOW *win)
+ return sc_seq_or(do_next_block, 0);
+ #endif
+
++#if defined(__linux__) && !defined(NANO_TINY)
+ /* When not running under X, check for the bare arrow keys whether
+ * the Ctrl key is being held together with them. */
+ if (console && (retval == KEY_UP || retval == KEY_DOWN ||
+@@ -521,6 +524,7 @@ int parse_kbinput(WINDOW *win)
+ return sc_seq_or(do_next_word_void, 0);
+ }
+ }
++#endif /* __linux__ && !NANO_TINY */
+
+ switch (retval) {
+ #ifdef KEY_SLEFT
+--
+2.11.1
+
diff --git a/app-editors/nano/nano-2.6.3.ebuild b/app-editors/nano/nano-2.6.3.ebuild
index b83331ab1f..668518d969 100644
--- a/app-editors/nano/nano-2.6.3.ebuild
+++ b/app-editors/nano/nano-2.6.3.ebuild
@@ -35,6 +35,7 @@ src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
+ epatch "${FILESDIR}"/${P}-minimal.patch #591026
epatch_user
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/
@ 2015-08-28 2:23 Manuel Rüger
0 siblings, 0 replies; 8+ messages in thread
From: Manuel Rüger @ 2015-08-28 2:23 UTC (permalink / raw
To: gentoo-commits
commit: e31ae64ca383c64789a8078e535628f118a7933d
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 02:20:29 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 02:23:05 2015 +0000
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 4d16cb2c684bf34f441096311778b9249243cc84351af7586ff1bbbbbd7c0fb251548a1fc987cb91a08633b49fb0841e97d3ca79e8392b8f0ff2e12560b2b098
-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 2c703bbc79304a28c06154a451a5035967101ecc82cddbd005cb1a6599466d8b54c944f2aef9dd6c7f9b7a171b705177e3d0e7a496c43ffca39000244371547e
DIST nano-2.3.6.tar.gz 1816012 SHA256 a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534 SHA512 00d66dbbd1ee59b3d606af8688599ce627aa98cee494611e255293347b9aa4f3f583820ac28adae5f7209410a28669cdd5211258411d83364d3eb788d909bb73 WHIRLPOOL 6900e40e41f7bbd23a0dc76fe24bbf29c46b65bead328cb574008045f397e92643a7cee35605ef044e1921029dca54e49831548828490abbf24b2c63f0f9092b
DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd SHA512 7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d WHIRLPOOL 1e4aaaa67c44bf051210b9c65db80c30189606fc2ba0d3e1a6802a41e7244901e60858ad412a0c6ee6e0eaa90d65925d8c954b398387cc12109a626811d8ad07
DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a
diff --git a/app-editors/nano/files/nano-1.3.12-fix2.patch b/app-editors/nano/files/nano-1.3.12-fix2.patch
deleted file mode 100644
index 1c6ba22..0000000
--- a/app-editors/nano/files/nano-1.3.12-fix2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru nano-1.3.12/src/rcfile.c nano-1.3.12-fix2/src/rcfile.c
---- nano-1.3.12/src/rcfile.c 2006-06-07 22:50:56.000000000 -0400
-+++ nano-1.3.12-fix2/src/rcfile.c 2006-07-18 19:22:30.000000000 -0400
-@@ -834,9 +834,11 @@
- rcfile_error(N_("Unknown flag \"%s\""), option);
- }
-
-+#ifdef ENABLE_COLOR
- if (endsyntax != NULL && endcolor == NULL)
- rcfile_error(N_("Syntax \"%s\" has no color commands"),
- endsyntax->desc);
-+#endif
-
- free(buf);
- fclose(rcstream);
diff --git a/app-editors/nano/files/nano-1.3.12-path.patch b/app-editors/nano/files/nano-1.3.12-path.patch
deleted file mode 100644
index b8b2a7e..0000000
--- a/app-editors/nano/files/nano-1.3.12-path.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -ur nano-1.3.12/src/files.c nano-1.3.12-fixed/src/files.c
---- nano-1.3.12/src/files.c 2006-06-14 09:19:43.000000000 -0400
-+++ nano-1.3.12-fixed/src/files.c 2006-07-05 11:44:17.000000000 -0400
-@@ -902,21 +902,29 @@
- * able to go there. */
- char *get_full_path(const char *origpath)
- {
-- char *d_here, *d_there = NULL;
-+ struct stat fileinfo;
-+ char *d_here, *d_there, *d_there_file = NULL;
-+ const char *last_slash;
-+ bool path_only;
-
- if (origpath == NULL)
- return NULL;
-
-- /* Get the current directory. */
-+ /* Get the current directory. If it doesn't exist, back up and try
-+ * again until we get a directory that does, and use that as the
-+ * current directory. */
- d_here = charalloc(PATH_MAX + 1);
- d_here = getcwd(d_here, PATH_MAX + 1);
-
-- if (d_here != NULL) {
-- const char *last_slash;
-- char *d_there_file = NULL;
-- bool path_only;
-- struct stat fileinfo;
-+ while (d_here == NULL) {
-+ if (chdir("..") == -1)
-+ break;
-+
-+ d_here = getcwd(d_here, PATH_MAX + 1);
-+ }
-
-+ /* If we succeeded, canonicalize it in d_here. */
-+ if (d_here != NULL) {
- align(&d_here);
-
- /* If the current directory isn't "/", tack a slash onto the end
-@@ -925,89 +933,91 @@
- d_here = charealloc(d_here, strlen(d_here) + 2);
- strcat(d_here, "/");
- }
-+ /* Otherwise, set d_here to "". */
-+ } else
-+ d_here = mallocstrcpy(NULL, "");
-
-- d_there = real_dir_from_tilde(origpath);
-+ d_there = real_dir_from_tilde(origpath);
-
-- assert(d_there != NULL);
-+ assert(d_there != NULL);
-
-- /* Stat d_there. If stat() fails, assume that d_there refers to
-- * a new file that hasn't been saved to disk yet. Set path_only
-- * to TRUE if d_there refers to a directory, and FALSE if
-- * d_there refers to a file. */
-- path_only = !stat(d_there, &fileinfo) &&
-- S_ISDIR(fileinfo.st_mode);
--
-- /* If path_only is TRUE, make sure d_there ends in a slash. */
-- if (path_only) {
-- size_t d_there_len = strlen(d_there);
--
-- if (d_there[d_there_len - 1] != '/') {
-- d_there = charealloc(d_there, d_there_len + 2);
-- strcat(d_there, "/");
-- }
-- }
-+ /* If stat()ing d_there fails, assume that d_there refers to a new
-+ * file that hasn't been saved to disk yet. Set path_only to TRUE
-+ * if d_there refers to a directory, and FALSE otherwise. */
-+ path_only = stat(d_there, &fileinfo) == 0 &&
-+ S_ISDIR(fileinfo.st_mode);
-
-- /* Search for the last slash in d_there. */
-- last_slash = strrchr(d_there, '/');
-+ /* If path_only is TRUE, make sure d_there ends in a slash. */
-+ if (path_only) {
-+ size_t d_there_len = strlen(d_there);
-
-- /* If we didn't find one, then make sure the answer is in the
-- * format "d_here/d_there". */
-- if (last_slash == NULL) {
-- assert(!path_only);
-+ if (d_there[d_there_len - 1] != '/') {
-+ d_there = charealloc(d_there, d_there_len + 2);
-+ strcat(d_there, "/");
-+ }
-+ }
-
-- d_there_file = d_there;
-- d_there = d_here;
-- } else {
-- /* If path_only is FALSE, then save the filename portion of
-- * the answer, everything after the last slash, in
-- * d_there_file. */
-- if (!path_only)
-- d_there_file = mallocstrcpy(NULL, last_slash + 1);
--
-- /* And remove the filename portion of the answer from
-- * d_there. */
-- null_at(&d_there, last_slash - d_there + 1);
--
-- /* Go to the path specified in d_there. */
-- if (chdir(d_there) == -1) {
-- free(d_there);
-- d_there = NULL;
-- } else {
-- /* Get the full path and save it in d_there. */
-- free(d_there);
-+ /* Search for the last slash in d_there. */
-+ last_slash = strrchr(d_there, '/');
-
-- d_there = charalloc(PATH_MAX + 1);
-- d_there = getcwd(d_there, PATH_MAX + 1);
-+ /* If we didn't find one, then make sure the answer is in the format
-+ * "d_here/d_there". */
-+ if (last_slash == NULL) {
-+ assert(!path_only);
-
-- if (d_there != NULL) {
-- align(&d_there);
-+ d_there_file = d_there;
-+ d_there = d_here;
-+ } else {
-+ /* If path_only is FALSE, then save the filename portion of the
-+ * answer (everything after the last slash) in d_there_file. */
-+ if (!path_only)
-+ d_there_file = mallocstrcpy(NULL, last_slash + 1);
-+
-+ /* And remove the filename portion of the answer from
-+ * d_there. */
-+ null_at(&d_there, last_slash - d_there + 1);
-+
-+ /* Go to the path specified in d_there. */
-+ if (chdir(d_there) == -1) {
-+ free(d_there);
-+ d_there = NULL;
-+ } else {
-+ free(d_there);
-
-- if (strcmp(d_there, "/") != 0) {
-- /* Make sure d_there ends in a slash. */
-- d_there = charealloc(d_there,
-- strlen(d_there) + 2);
-- strcat(d_there, "/");
-- }
-- } else
-- /* If we couldn't get the full path, set path_only
-- * to TRUE so that we clean up correctly, free all
-- * allocated memory, and return NULL. */
-- path_only = TRUE;
--
-- /* Finally, go back to the path specified in d_here,
-- * where we were before. */
-- chdir(d_here);
-- }
-+ /* Get the full path. */
-+ d_there = charalloc(PATH_MAX + 1);
-+ d_there = getcwd(d_there, PATH_MAX + 1);
-+
-+ /* If we succeeded, canonicalize it in d_there. */
-+ if (d_there != NULL) {
-+ align(&d_there);
-+
-+ /* If the current directory isn't "/", tack a slash onto
-+ * the end of it. */
-+ if (strcmp(d_there, "/") != 0) {
-+ d_there = charealloc(d_there, strlen(d_there) + 2);
-+ strcat(d_there, "/");
-+ }
-+ } else
-+ /* Otherwise, set path_only to TRUE, so that we clean up
-+ * correctly, free all allocated memory, and return
-+ * NULL. */
-+ path_only = TRUE;
-+
-+ /* Finally, go back to the path specified in d_here,
-+ * where we were before. We don't check for a chdir()
-+ * error, since we can do nothing then. */
-+ chdir(d_here);
-
- /* Free d_here, since we're done using it. */
- free(d_here);
- }
-
-- /* At this point, if path_only is FALSE and d_there exists,
-+ /* At this point, if path_only is FALSE and d_there isn't NULL,
- * d_there contains the path portion of the answer and
- * d_there_file contains the filename portion of the answer. If
-- * this is the case, tack d_there_file onto the end of
-- * d_there, so that d_there contains the complete answer. */
-+ * this is the case, tack the latter onto the end of the former.
-+ * d_there will then contain the complete answer. */
- if (!path_only && d_there != NULL) {
- d_there = charealloc(d_there, strlen(d_there) +
- strlen(d_there_file) + 1);
diff --git a/app-editors/nano/files/nano-1.3.12-scroll.patch b/app-editors/nano/files/nano-1.3.12-scroll.patch
deleted file mode 100644
index f5d5336..0000000
--- a/app-editors/nano/files/nano-1.3.12-scroll.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix from upstream
-
-diff -ur nano-1.3.12/src/move.c nano-1.3.12-fixed/src/move.c
---- nano-1.3.12/src/move.c 2006-05-21 22:08:49.000000000 -0400
-+++ nano-1.3.12-fixed/src/move.c 2006-07-06 17:01:03.000000000 -0400
-@@ -521,6 +521,16 @@
-
- /* Scroll the edit window up one line. */
- edit_scroll(UP, 1);
-+
-+ /* If we're not on the first line of the edit window, update the
-+ * line we were on before and the line we're on now. The former
-+ * needs to be redrawn if we're not on the first page, and the
-+ * latter needs to be drawn unconditionally. */
-+ if (openfile->current_y > 0) {
-+ if (need_vertical_update(0))
-+ update_line(openfile->current->next, 0);
-+ update_line(openfile->current, openfile->current_x);
-+ }
- }
- #endif /* !NANO_TINY */
-
-@@ -574,6 +584,16 @@
-
- /* Scroll the edit window down one line. */
- edit_scroll(DOWN, 1);
-+
-+ /* If we're not on the last line of the edit window, update the line
-+ * we were on before and the line we're on now. The former needs to
-+ * be redrawn if we're not on the first page, and the latter needs
-+ * to be drawn unconditionally. */
-+ if (openfile->current_y < editwinrows - 1) {
-+ if (need_vertical_update(0))
-+ update_line(openfile->current->prev, 0);
-+ update_line(openfile->current, openfile->current_x);
-+ }
- }
- #endif /* !NANO_TINY */
-
diff --git a/app-editors/nano/files/nano-2.3.1-bind-unbind-docs.patch b/app-editors/nano/files/nano-2.3.1-bind-unbind-docs.patch
deleted file mode 100644
index 300ee2d..0000000
--- a/app-editors/nano/files/nano-2.3.1-bind-unbind-docs.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 5afd6d3e9558f8295496f7c59c765947e7f19d8a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 28 Nov 2011 15:37:02 -0500
-Subject: [PATCH 1/2] nanorc(5): fix bind/unbind documentation
-
-The unbind section is listed after valid key/menu/functions, but tries
-to say those sections come after it. So reorganization the section so
-that bind/unbind comes first, and then we cover the key/menu/functions
-after both of them.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/man/nanorc.5 | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
-index da33179..2da71ab 100644
---- a/doc/man/nanorc.5
-+++ b/doc/man/nanorc.5
-@@ -282,9 +282,19 @@ Read in self-contained color syntaxes from \fIsyntaxfile\fP. Note that
- .SH KEY BINDINGS
- Key bindings may be reassigned via the following commands:
- .TP
--.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
-+.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
- Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
--context of menu \fImenu\fP. The format of \fIkey\fP should be one of:
-+context of menu \fImenu\fP.
-+.TP
-+.B unbind \fIkey\fP \fImenu\fP
-+Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all
-+menus by using \fIall\fP. Same key syntax as for binding.
-+Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
-+context of menu \fImenu\fP.
-+.TP
-+
-+The format of \fIkey\fP should be one of:
-+
- .TP
- .B ^
- followed by an alpha character or the word "Space".
-@@ -298,8 +308,10 @@ Example: M-C
- followed by a numeric value from 1 to 16.
- Example: F10
- .TP
--Valid function names to be bound include:
--.TP 3
-+
-+Valid \fIfunction\fP names to be bound include:
-+
-+.TP 2
- .B help
- Invoke the help menu.
- .TP
-@@ -506,8 +518,9 @@ Toggle whether long lines will be wrapped to the next line.
- Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
- .TP
-
--Valid menu sections are:
--.TP
-+Valid \fImenu\fP sections are:
-+
-+.TP 2
- .B main
- The main editor window where text is entered.
- .TP
-@@ -549,13 +562,6 @@ The 'go to directory' menu.
- .TP
- .B all
- A special name meaning: apply to all menus where this function exists.
--
--.TP
--.B unbind \fIkey\fP \fImenu\fP
--Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all
--menus by using \fIall\fP. Same key syntax as for binding.
--Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
--context of menu \fImenu\fP. The format of \fIkey\fP should be one of:
- .SH FILES
- .TP
- .I SYSCONFDIR/nanorc
---
-1.7.9.7
-
-From 4b3e912d4a5c3561d1cfaf944d33ba9c30a9a555 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 28 Nov 2011 15:38:26 -0500
-Subject: [PATCH 2/2] nanorc syntax: add bind/unbind commands
-
-We don't currently handle the bind/unbind commands, so adding them to
-your nanorc file with colorization enabled makes it look like they're
-not actually supported.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/syntax/nanorc.nanorc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
-index bda5f4f..287be56 100644
---- a/doc/syntax/nanorc.nanorc
-+++ b/doc/syntax/nanorc.nanorc
-@@ -2,10 +2,12 @@
- ##
- syntax "nanorc" "\.?nanorc$"
- ## Possible errors and parameters
--icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
-+icolor brightwhite "^[[:space:]]*((un)?(bind|set)|include|syntax|i?color).*$"
- ## Keywords
- icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|poslog|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>"
--icolor green "^[[:space:]]*(set|unset|include|syntax|header|magic)\>"
-+icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]+[[:alpha:]]+[[:space:]]*$"
-+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]*$"
-+icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic)\>"
- ## Colors
- icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
- icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
---
-1.7.9.7
diff --git a/app-editors/nano/files/nano-2.3.1-drop-target.patch b/app-editors/nano/files/nano-2.3.1-drop-target.patch
deleted file mode 100644
index 3b56476..0000000
--- a/app-editors/nano/files/nano-2.3.1-drop-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0708d921211fa0f89288690593c406a682b2c826 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 14 Jun 2011 16:00:52 -0400
-Subject: [PATCH] drop --target as it makes no sense
-
-Since nano doesn't produce code, the --target option to configure
-doesn't make sense. So only support --{build,host} since those are
-what we need in order to cross-compile.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c590737..3eb61c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@
-
- AC_INIT([GNU nano], [2.3.1], [nano-devel@gnu.org], [nano])
- AC_CONFIG_SRCDIR([src/nano.c])
--AC_CANONICAL_TARGET([])
-+AC_CANONICAL_HOST
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([config.h])
-
---
-1.7.9.7
-
diff --git a/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch b/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
deleted file mode 100644
index c775e29..0000000
--- a/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 7051588fee7a20a69c67c8899b3e6c35ebf51fbf Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 25 Aug 2012 23:03:22 -0400
-Subject: [PATCH] gentoo syntax: update
-
-Update to newer EAPIs, and fold in updated shell changes too.
-Much of this is based on work by Davide.
-
-Reported-by: Davide Pesavento <pesa@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/syntax/gentoo.nanorc | 46 +++++++++++++++++++++++++++-------------------
- 1 file changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc
-index 2ad1597..ad89fce 100644
---- a/doc/syntax/gentoo.nanorc
-+++ b/doc/syntax/gentoo.nanorc
-@@ -2,30 +2,38 @@
- ##
- syntax "ebuild" "\.e(build|class)$"
- ## All the standard portage functions
--color brightgreen "^src_(unpack|prepare|configure|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
-+color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
-+color brightgreen "^pkg_(config|nofetch|pretend|setup|(pre|post)(inst|rm))\>"
-+color brightgreen "\<default(_pkg_nofetch)?\>"
- ## Highlight bash related syntax
--color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
--color green "\<(declare|eval|exec|let)\>"
--color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
--color green "-[edfgruwxL]\>"
--color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
-+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
-+color green "\<(declare|eval|exec|export|let|local)\>"
-+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
-+color green "-[defhnrsuwxzL]\>"
-+color green "-(eq|ne|gt|lt|ge|le)\>"
- ## Highlight variables ... official portage ones in red, all others in bright red
--color brightred "\$\{?[a-zA-Z_0-9]+\}?"
--color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|RESTRICT|USERLAND)\>"
--color red "\<(S|D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|ROOT|WORKDIR)\>" "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
--color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>" "\<WANT_AUTO(CONF|MAKE)\>" "\<AT_M4DIR\>"
-+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
-+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
-+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
-+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>"
-+color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
-+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
-+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
- ## Highlight portage commands
--color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
--color brightblue "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon?|error|log|patch|new(group|user))\>"
--color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make))\>"
--color brightblue "\<built_with_use\>" "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
--color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>"
-+color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\> [!a-zA-Z0-9_+ -]*" "inherit.*"
-+color brightblue "\<e(begin|end|conf|install|make|qmake4|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
-+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
-+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<version_is_at_least\>"
-+color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
-+color brightblue "\<(die|has|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
- color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
--color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
--color brightblue "prepall(docs|info|man|strip)?" "prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)"
-+color brightblue "\<do(compress|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-+color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)\>"
- color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
-+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
-+color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
- ## Highlight common commands used in ebuilds
--color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
-+color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
- ## Highlight comments (doesnt work that well)
- color yellow "(^|[[:space:]])#.*$"
- ## Highlight strings (doesnt work that well)
-@@ -35,7 +43,7 @@ color ,green "[[:space:]]+$"
-
- ## Here is an example for Portage control files
- ##
--syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$"
-+syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
- ## Base text:
- color green "^.+$"
- ## Use flags:
---
-1.8.3.2
-
---- a/doc/syntax/gentoo.nanorc
-+++ b/doc/syntax/gentoo.nanorc
-@@ -61,3 +61,5 @@ color cyan "^[[:space:]]*.*/"
- color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
- ## Comments:
- color yellow "#.*$"
-+## Trailing space is bad!
-+color ,green "[[:space:]]+$"
diff --git a/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch b/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
deleted file mode 100644
index 84bd0b7..0000000
--- a/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c662db58448fefe86184117e6bab5799e43eccf1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 1 Jan 2012 02:26:16 -0500
-Subject: [PATCH] search ncurses via pkg-config first
-
-Newer ncurses installs include pkg-config files which tell us the right
--I/-L paths we need, so default to that before trying the legacy ways.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1f61ae4..05308be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,7 @@ AC_PROG_CC
- AC_PROG_LN_S
- AC_ISC_POSIX
- AC_SYS_LARGEFILE
-+PKG_PROG_PKG_CONFIG
-
- dnl Internationalization macros.
-
-@@ -439,6 +440,23 @@ AC_CHECK_FUNCS(getopt_long)
- dnl Checks for libraries.
-
- if eval "test x$CURSES_LIB_NAME = x"; then
-+ if test x$enable_utf8 != xno; then
-+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
-+ CURSES_LIB=$NCURSESW_LIBS
-+ CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
-+ CURSES_LIB_NAME=ncursesw
-+ CURSES_LIB_WIDE=yes
-+ ], [:])
-+ else
-+ PKG_CHECK_MODULES([NCURSES], [ncurses], [
-+ CURSES_LIB=$NCURSES_LIBS
-+ CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
-+ CURSES_LIB_NAME=ncurses
-+ ], [:])
-+ fi
-+fi
-+
-+if eval "test x$CURSES_LIB_NAME = x"; then
- AC_CHECK_HEADERS(ncurses.h)
-
- if test x$enable_utf8 != xno; then
---
-1.7.6.1
-
diff --git a/app-editors/nano/files/nano-2.3.1-shell-nanorc.patch b/app-editors/nano/files/nano-2.3.1-shell-nanorc.patch
deleted file mode 100644
index 805130f..0000000
--- a/app-editors/nano/files/nano-2.3.1-shell-nanorc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5a6a9c107148162f47032b03af3f393c3888c5df Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 28 Feb 2012 11:14:33 -0500
-Subject: [PATCH] shell syntax: major updates
-
-Highlight more shell builtins and common commands.
-
-Rewrite the variable highlighting to be more exact and handle cases where
-string operations are used.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/syntax/sh.nanorc | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc
-index f660105..a664ef6 100644
---- a/doc/syntax/sh.nanorc
-+++ b/doc/syntax/sh.nanorc
-@@ -4,12 +4,17 @@ syntax "sh" "\.sh$"
- magic "(POSIX|Bourne.*) shell script text"
- header "^#!.*/(ba|k|pdk)?sh[-0-9_]*"
- icolor brightgreen "^[0-9A-Z_]+\(\)"
--color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
--color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
-+color green "\<(declare|eval|exec|export|let|local)\>"
-+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
- color green "-[Ldefgruwx]\>"
- color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
--color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
--icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
-+color brightblue "\<(awk|cat|cd|ch(grp|mod|own)|cp|echo|env|grep|install|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|umask|unset)\>"
-+# Basic variable names (no braces)
-+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
-+# More complicated variable names; handles braces
-+# and replacements and arrays
-+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:space:]]*[[:alnum:]_]+[[:space:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
- color cyan "(^|[[:space:]])#.*$"
- color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
- color ,green "[[:space:]]+$"
---
-1.7.9.7
-
diff --git a/app-editors/nano/files/nano-2.3.2-bind-unbind-docs.patch b/app-editors/nano/files/nano-2.3.2-bind-unbind-docs.patch
deleted file mode 100644
index cd7dd34..0000000
--- a/app-editors/nano/files/nano-2.3.2-bind-unbind-docs.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 17e1ba8530b9e21932935ad052ad416a0c2058a7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 28 Nov 2011 15:37:02 -0500
-Subject: [PATCH] nanorc(5): fix bind/unbind documentation
-
-The unbind section is listed after valid key/menu/functions, but tries
-to say those sections come after it. So reorganization the section so
-that bind/unbind comes first, and then we cover the key/menu/functions
-after both of them.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/man/nanorc.5 | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
-index b9c0a19..3fc3c5d 100644
---- a/doc/man/nanorc.5
-+++ b/doc/man/nanorc.5
-@@ -285,9 +285,19 @@ Read in self-contained color syntaxes from \fIsyntaxfile\fP. Note that
- .SH KEY BINDINGS
- Key bindings may be reassigned via the following commands:
- .TP
--.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
-+.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
- Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
--context of menu \fImenu\fP. The format of \fIkey\fP should be one of:
-+context of menu \fImenu\fP.
-+.TP
-+.B unbind \fIkey\fP \fImenu\fP
-+Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all
-+menus by using \fIall\fP. Same key syntax as for binding.
-+Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
-+context of menu \fImenu\fP.
-+.TP
-+
-+The format of \fIkey\fP should be one of:
-+
- .TP
- .B ^
- followed by an alpha character or the word "Space".
-@@ -301,8 +311,10 @@ Example: M-C
- followed by a numeric value from 1 to 16.
- Example: F10
- .TP
--Valid function names to be bound include:
--.TP 3
-+
-+Valid \fIfunction\fP names to be bound include:
-+
-+.TP 2
- .B help
- Invoke the help menu.
- .TP
-@@ -509,8 +521,9 @@ Toggle whether long lines will be wrapped to the next line.
- Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
- .TP
-
--Valid menu sections are:
--.TP
-+Valid \fImenu\fP sections are:
-+
-+.TP 2
- .B main
- The main editor window where text is entered.
- .TP
-@@ -552,13 +565,6 @@ The 'go to directory' menu.
- .TP
- .B all
- A special name meaning: apply to all menus where this function exists.
--
--.TP
--.B unbind \fIkey\fP \fImenu\fP
--Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all
--menus by using \fIall\fP. Same key syntax as for binding.
--Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
--context of menu \fImenu\fP. The format of \fIkey\fP should be one of:
- .SH FILES
- .TP
- .I SYSCONFDIR/nanorc
---
-1.8.1.2
-
-From 0d49d9f0c62013e0d86169a92a2d0f5557e7be05 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 28 Nov 2011 15:38:26 -0500
-Subject: [PATCH] nanorc syntax: add bind/unbind commands
-
-We don't currently handle the bind/unbind commands, so adding them to
-your nanorc file with colorization enabled makes it look like they're
-not actually supported.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/syntax/nanorc.nanorc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
-index 2c9f23a..494c2f4 100644
---- a/doc/syntax/nanorc.nanorc
-+++ b/doc/syntax/nanorc.nanorc
-@@ -2,10 +2,12 @@
- ##
- syntax "nanorc" "\.?nanorc$"
- ## Possible errors and parameters
--icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
-+icolor brightwhite "^[[:space:]]*((un)?(bind|set)|include|syntax|i?color).*$"
- ## Keywords
- icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|poslog|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds|locking)\>"
--icolor green "^[[:space:]]*(set|unset|include|syntax|header|magic)\>"
-+icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]+[[:alpha:]]+[[:space:]]*$"
-+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]*$"
-+icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic)\>"
- ## Colors
- icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
- icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
---
-1.8.1.2
-
diff --git a/app-editors/nano/nano-1.3.12-r1.ebuild b/app-editors/nano/nano-1.3.12-r1.ebuild
deleted file mode 100644
index ad05ed3..0000000
--- a/app-editors/nano/nano-1.3.12-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-inherit eutils
-
-MY_P=${PN}-${PV/_}
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
- nls? ( sys-devel/gettext )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-path.patch
- epatch "${FILESDIR}"/${P}-scroll.patch
- epatch "${FILESDIR}"/${P}-fix2.patch
-}
-
-src_compile() {
- if [[ ! -e configure ]] ; then
- ./autogen.sh || die "autogen failed"
- fi
-
- local myconf=""
- use ncurses \
- && myconf="--without-slang" \
- || myconf="${myconf} $(use_with slang)"
-
- econf \
- --bindir=/bin \
- --enable-color \
- --enable-multibuffer \
- --enable-nanorc \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- ${myconf} \
- || die "configure failed"
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml *.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- insinto /usr/share/nano
- doins "${FILESDIR}"/*.nanorc || die
- echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
- einfo "More helpful info about nano, visit the GDP page:"
- einfo "https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.0.9.ebuild b/app-editors/nano/nano-2.0.9.ebuild
deleted file mode 100644
index 33a5335..0000000
--- a/app-editors/nano/nano-2.0.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
- ECVS_MODULE="nano"
- ECVS_AUTH="pserver"
- ECVS_USER="anonymous"
- inherit cvs
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
- nls? ( sys-devel/gettext )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- if [[ ! -e configure ]] ; then
- ./autogen.sh || die "autogen failed"
- fi
-}
-
-src_compile() {
- local myconf=""
- use ncurses \
- && myconf="--without-slang" \
- || myconf="${myconf} $(use_with slang)"
-
- econf \
- --bindir=/bin \
- --enable-color \
- --enable-multibuffer \
- --enable-nanorc \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- ${myconf} \
- || die "configure failed"
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml *.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- insinto /usr/share/nano
- doins "${FILESDIR}"/*.nanorc || die
- echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
- einfo "More helpful info about nano, visit the GDP page:"
- einfo "https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.1.10.ebuild b/app-editors/nano/nano-2.1.10.ebuild
deleted file mode 100644
index cd5b9c9..0000000
--- a/app-editors/nano/nano-2.1.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2[unicode?]
- nls? ( sys-devel/gettext )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- subversion_src_unpack
- else
- unpack ${A}
- fi
- cd "${S}"
- if [[ ! -e configure ]] ; then
- ./autogen.sh || die "autogen failed"
- fi
-}
-
-src_configure() {
- local myconf=""
- use ncurses \
- && myconf="--without-slang" \
- || myconf="${myconf} $(use_with slang)"
-
- econf \
- --bindir=/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- ${myconf} \
- || die "configure failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-
- insinto /usr/share/nano
- local f
- for f in "${FILESDIR}"/*.nanorc ; do
- [[ -e ${D}/usr/share/nano/${f##*/} ]] && continue
- doins "${f}" || die
- echo "# include \"/usr/share/nano/${f##*/}\"" >> "${D}"/etc/nanorc
- done
-}
-
-pkg_postinst() {
- einfo "More helpful info about nano, visit the GDP page:"
- einfo "https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.2.5.ebuild b/app-editors/nano/nano-2.2.5.ebuild
deleted file mode 100644
index 8977326..0000000
--- a/app-editors/nano/nano-2.2.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2[unicode?]
- nls? ( sys-devel/gettext )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- subversion_src_unpack
- else
- unpack ${A}
- fi
- cd "${S}"
- if [[ ! -e configure ]] ; then
- ./autogen.sh || die "autogen failed"
- fi
-}
-
-src_configure() {
- local myconf=""
- use ncurses \
- && myconf="--without-slang" \
- || myconf="${myconf} $(use_with slang)"
-
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- ${myconf} \
- || die "configure failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-
- insinto /usr/share/nano
- local f
- for f in "${FILESDIR}"/*.nanorc ; do
- [[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
- doins "${f}" || die
- echo "# include \"/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
- done
-}
-
-pkg_postinst() {
- einfo "More helpful info about nano, visit the GDP page:"
- einfo "https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.3.1-r1.ebuild b/app-editors/nano/nano-2.3.1-r1.ebuild
deleted file mode 100644
index 02b0ae6..0000000
--- a/app-editors/nano/nano-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils autotools
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- nls? ( sys-devel/gettext )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- use ncurses \
- && myconf="--without-slang" \
- || myconf="${myconf} $(use_with slang)"
-
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
- einfo "More helpful info about nano, visit the GDP page:"
- einfo "https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.3.1-r2.ebuild b/app-editors/nano/nano-2.3.1-r2.ebuild
deleted file mode 100644
index afb9bbd..0000000
--- a/app-editors/nano/nano-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils autotools
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify +magic minimal ncurses nls slang spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.1-drop-target.patch
- epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
- epatch "${FILESDIR}"/${PN}-2.3.1-bind-unbind-docs.patch
- epatch "${FILESDIR}"/${PN}-2.3.1-{shell,gentoo}-nanorc.patch
- eautoreconf
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang))
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- rm -rf "${ED}"/usr/share/nano/man-html
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.3.1.ebuild b/app-editors/nano/nano-2.3.1.ebuild
deleted file mode 100644
index ded16d4..0000000
--- a/app-editors/nano/nano-2.3.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2[unicode?]
- nls? ( sys-devel/gettext )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- ./autogen.sh || die
- fi
-}
-
-src_configure() {
- local myconf=""
- use ncurses \
- && myconf="--without-slang" \
- || myconf="${myconf} $(use_with slang)"
-
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-
- insinto /usr/share/nano
- local f
- for f in "${FILESDIR}"/*.nanorc ; do
- [[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
- doins "${f}" || die
- echo "# include \"/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
- done
-}
-
-pkg_postinst() {
- einfo "More helpful info about nano, visit the GDP page:"
- einfo "https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.3.2-r1.ebuild b/app-editors/nano/nano-2.3.2-r1.ebuild
deleted file mode 100644
index f5af13c..0000000
--- a/app-editors/nano/nano-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils autotools
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-bind-unbind-docs.patch
- epatch "${FILESDIR}"/${PN}-2.3.1-{shell,gentoo}-nanorc.patch
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${ED}"/usr/share/nano/man-html
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.3.2.ebuild b/app-editors/nano/nano-2.3.2.ebuild
deleted file mode 100644
index d7ec222..0000000
--- a/app-editors/nano/nano-2.3.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils autotools
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify +magic minimal ncurses nls slang spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-bind-unbind-docs.patch
- epatch "${FILESDIR}"/${PN}-2.3.1-{shell,gentoo}-nanorc.patch
- eautoreconf
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- rm -rf "${ED}"/usr/share/nano/man-html
-
- dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.3.3.ebuild b/app-editors/nano/nano-2.3.3.ebuild
deleted file mode 100644
index 093b904..0000000
--- a/app-editors/nano/nano-2.3.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.3.4.ebuild b/app-editors/nano/nano-2.3.4.ebuild
deleted file mode 100644
index 093b904..0000000
--- a/app-editors/nano/nano-2.3.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-08-12 9:43 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-02 0:23 [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2020-08-12 9:43 Lars Wendler
2020-07-31 8:38 Lars Wendler
2020-03-27 8:22 Lars Wendler
2019-04-01 15:13 Lars Wendler
2018-09-14 7:37 Lars Wendler
2017-02-18 18:57 Mike Frysinger
2015-08-28 2:23 Manuel Rüger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox