commit: 8aff3e95e11b7417e7a558761ed13842d69042e3 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Feb 24 12:22:05 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Feb 24 12:22:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aff3e95
app-editors/nano: Removed old Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-editors/nano/Manifest | 2 - .../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 | 88 ------ app-editors/nano/nano-5.4.ebuild | 92 ------ 5 files changed, 570 deletions(-) diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 65ea113183a..224eabbe48b 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,5 +1,3 @@ -DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d -DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28 DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056 DIST nano-5.6.tar.gz 2956090 BLAKE2B 753c49e67403577ac272438b2a577f29978f621cb1823f3ccc4fb5df229b805c72a7123d5e5632cb9e1d4b50c7cf90675d748e7e88709703be44126e11231974 SHA512 fff8a558b435b9f372f19306e63c3bad34a60b4b1979ddf2a5724f96ca69fd7fd5850e841f714fad2e382ffc8e5c3f5085f6a6e965ff30f44bf12b8ac865fe6b 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 deleted file mode 100644 index 978e24de805..00000000000 --- a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch +++ /dev/null @@ -1,342 +0,0 @@ -From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg <[email protected]> -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 <[email protected]> ---- - 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 deleted file mode 100644 index 52112bab723..00000000000 --- a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg <[email protected]> -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 <[email protected]> ---- - 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 deleted file mode 100644 index 869ecf6995d..00000000000 --- a/app-editors/nano/nano-4.9.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 -" - -REQUIRED_USE="!ncurses? ( slang? ( minimal ) )" - -PATCHES=( - "${FILESDIR}/${P}-disable-speller_build_fix.patch" - "${FILESDIR}/${P}-minimal_build_fix.patch" #734856 -) - -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 -} diff --git a/app-editors/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.4.ebuild deleted file mode 100644 index 92473ae856c..00000000000 --- a/app-editors/nano/nano-5.4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 -" - -REQUIRED_USE=" - !ncurses? ( slang? ( minimal ) ) - magic? ( !minimal ) -" - -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 - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - fi - - use split-usr && dosym ../../bin/nano /usr/bin/nano -}
