From c3fc794d8d02fa75325b3a22a628dc9ff0169c6b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Jul 2004 00:45:34 +0000 Subject: prune out old and sync-stable --- app-editors/nano/files/1.3.1-nomac.patch | 11 -- app-editors/nano/files/1.3.1-wsconvert.patch | 197 --------------------------- app-editors/nano/files/digest-nano-1.2.3 | 1 - app-editors/nano/files/digest-nano-1.3.1 | 1 - app-editors/nano/files/nanohupterm.patch | 16 --- app-editors/nano/nano-1.2.3.ebuild | 58 -------- app-editors/nano/nano-1.2.4.ebuild | 4 +- app-editors/nano/nano-1.3.1.ebuild | 65 --------- app-editors/nano/nano-1.3.2.ebuild | 4 +- 9 files changed, 4 insertions(+), 353 deletions(-) delete mode 100644 app-editors/nano/files/1.3.1-nomac.patch delete mode 100644 app-editors/nano/files/1.3.1-wsconvert.patch delete mode 100644 app-editors/nano/files/digest-nano-1.2.3 delete mode 100644 app-editors/nano/files/digest-nano-1.3.1 delete mode 100644 app-editors/nano/files/nanohupterm.patch delete mode 100644 app-editors/nano/nano-1.2.3.ebuild delete mode 100644 app-editors/nano/nano-1.3.1.ebuild (limited to 'app-editors') diff --git a/app-editors/nano/files/1.3.1-nomac.patch b/app-editors/nano/files/1.3.1-nomac.patch deleted file mode 100644 index c03eb459aeef..000000000000 --- a/app-editors/nano/files/1.3.1-nomac.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur src.orig/global.c src/global.c ---- src.orig/global.c 2004-01-26 03:41:57.311795432 -0500 -+++ src/global.c 2004-01-26 03:49:42.517073480 -0500 -@@ -290,7 +290,6 @@ - #endif - toggle_init_one(TOGGLE_NOCONVERT_KEY, toggle_noconvert_msg, NO_CONVERT); - toggle_init_one(TOGGLE_DOS_KEY, toggle_dos_msg, DOS_FILE); -- toggle_init_one(TOGGLE_MAC_KEY, toggle_mac_msg, MAC_FILE); - toggle_init_one(TOGGLE_BACKUP_KEY, toggle_backup_msg, BACKUP_FILE); - toggle_init_one(TOGGLE_SMOOTH_KEY, toggle_smooth_msg, SMOOTHSCROLL); - #ifdef ENABLE_COLOR diff --git a/app-editors/nano/files/1.3.1-wsconvert.patch b/app-editors/nano/files/1.3.1-wsconvert.patch deleted file mode 100644 index f7f5fe933bae..000000000000 --- a/app-editors/nano/files/1.3.1-wsconvert.patch +++ /dev/null @@ -1,197 +0,0 @@ -diff -ur nano-1.3.1.orig/doc/nanorc.sample nano-1.3.1/doc/nanorc.sample ---- nano-1.3.1.orig/doc/nanorc.sample 2004-01-10 03:04:04.105882992 -0500 -+++ nano-1.3.1/doc/nanorc.sample 2004-01-10 03:04:29.507021432 -0500 -@@ -86,6 +86,16 @@ - ## Use this tab size instead of the default; it must be greater than 0 - # set tabsize 8 - -+## Use this tab char instead of the default space; it can either be the -+## ascii value of the character you wish to see (refer to ascii(7)) or -+## it can be a single character. 187 seems to be a 'good' value. -+# set tabconvert 32 -+## Same as tabconverting above, but applied to spaces. -+## it can be a single character. 183 seems to be a 'good' value. -+# set spaceconvert 32 -+## Finally, you can toggle whitespace converting with this -+# set wsconvert -+ - ## Save automatically on exit, don't prompt - # set tempfile - -diff -ur nano-1.3.1.orig/src/global.c nano-1.3.1/src/global.c ---- nano-1.3.1.orig/src/global.c 2004-01-10 03:04:04.115881472 -0500 -+++ nano-1.3.1/src/global.c 2004-01-10 03:05:01.991083104 -0500 -@@ -84,6 +84,9 @@ - int tabsize = -1; /* Our internal tabsize variable. The - default value 8 is set in main(). */ - -+int tabconvert = ' '; -+int spaceconvert = ' '; -+ - char *hblank = NULL; /* A horizontal blank line */ - #ifndef DISABLE_HELP - char *help_text; /* The text in the help window */ -@@ -227,7 +230,7 @@ - char *toggle_const_msg, *toggle_autoindent_msg, *toggle_suspend_msg, - *toggle_nohelp_msg, *toggle_cuttoend_msg, - *toggle_noconvert_msg, *toggle_dos_msg, *toggle_mac_msg, -- *toggle_backup_msg, *toggle_smooth_msg; -+ *toggle_backup_msg, *toggle_smooth_msg, *toggle_wsconvert_msg; - #ifndef DISABLE_MOUSE - char *toggle_mouse_msg; - #endif -@@ -259,6 +262,7 @@ - toggle_mac_msg = _("Writing file in Mac format"); - toggle_backup_msg = _("Backing up file"); - toggle_smooth_msg = _("Smooth scrolling"); -+ toggle_wsconvert_msg = _("Whitespace converting"); - #ifdef ENABLE_COLOR - toggle_syntax_msg = _("Color syntax highlighting"); - #endif -@@ -275,6 +279,7 @@ - #endif - toggle_init_one(TOGGLE_CONST_KEY, toggle_const_msg, CONSTUPDATE); - toggle_init_one(TOGGLE_AUTOINDENT_KEY, toggle_autoindent_msg, AUTOINDENT); -+ toggle_init_one(TOGGLE_WSCONVERT_KEY, toggle_wsconvert_msg, WS_CONVERT); - #ifndef DISABLE_WRAPPING - toggle_init_one(TOGGLE_WRAP_KEY, toggle_wrap_msg, NO_WRAP); - #endif -diff -ur nano-1.3.1.orig/src/nano.c nano-1.3.1/src/nano.c ---- nano-1.3.1.orig/src/nano.c 2004-01-10 03:04:04.140877672 -0500 -+++ nano-1.3.1/src/nano.c 2004-01-10 03:04:29.511020824 -0500 -@@ -3035,6 +3035,9 @@ - edit_refresh(); - break; - #endif -+ case TOGGLE_WSCONVERT_KEY: -+ edit_refresh(); -+ break; - } - - /* We are assuming here that shortcut_init() above didn't free and -diff -ur nano-1.3.1.orig/src/nano.h nano-1.3.1/src/nano.h ---- nano-1.3.1.orig/src/nano.h 2004-01-10 03:04:04.139877824 -0500 -+++ nano-1.3.1/src/nano.h 2004-01-10 03:04:29.512020672 -0500 -@@ -289,6 +289,7 @@ - #define HISTORY_CHANGED (1<<28) - #define HISTORYLOG (1<<29) - #define JUSTIFY_MODE (1<<30) -+#define WS_CONVERT (1<<31) - - /* Control key sequences, changing these would be very very bad. */ - #define NANO_CONTROL_SPACE 0 -@@ -451,6 +452,7 @@ - #define TOGGLE_MAC_KEY NANO_ALT_O - #define TOGGLE_SMOOTH_KEY NANO_ALT_S - #define TOGGLE_NOCONVERT_KEY NANO_ALT_N -+#define TOGGLE_WSCONVERT_KEY NANO_ALT_E - #define TOGGLE_BACKUP_KEY NANO_ALT_B - #define TOGGLE_SYNTAX_KEY NANO_ALT_Y - #endif /* !NANO_SMALL */ -diff -ur nano-1.3.1.orig/src/proto.h nano-1.3.1/src/proto.h ---- nano-1.3.1.orig/src/proto.h 2004-01-10 03:04:04.140877672 -0500 -+++ nano-1.3.1/src/proto.h 2004-01-10 03:04:29.513020520 -0500 -@@ -41,7 +41,7 @@ - extern long totsize; - extern int temp_opt; - extern int flags; --extern int tabsize; -+extern int tabsize, tabconvert, spaceconvert; - extern int search_last_line; - extern int search_offscreen; - extern int currslen; -diff -ur nano-1.3.1.orig/src/rcfile.c nano-1.3.1/src/rcfile.c ---- nano-1.3.1.orig/src/rcfile.c 2004-01-10 03:04:04.140877672 -0500 -+++ nano-1.3.1/src/rcfile.c 2004-01-10 03:04:29.514020368 -0500 -@@ -60,6 +60,7 @@ - #endif - #ifndef NANO_SMALL - {"noconvert", NO_CONVERT}, -+ {"wsconvert", WS_CONVERT}, - #endif - {"nofollow", NOFOLLOW_SYMLINKS}, - {"nohelp", NO_HELP}, -@@ -85,6 +86,8 @@ - #endif - {"suspend", SUSPEND}, - {"tabsize", 0}, -+ {"tabconvert", ' '}, -+ {"spaceconvert", ' '}, - {"tempfile", TEMP_OPT}, - {"view", VIEW_MODE}, - {NULL, 0} -@@ -531,6 +534,8 @@ - #endif - if (set == 1) { - if (!strcasecmp(rcopts[i].name, "tabsize") -+ || !strcasecmp(rcopts[i].name, "tabconvert") -+ || !strcasecmp(rcopts[i].name, "spaceconvert") - #ifndef DISABLE_OPERATINGDIR - || !strcasecmp(rcopts[i].name, "operatingdir") - #endif -@@ -594,12 +599,30 @@ - * accept 0 while checking other - * errors. */ - j = (int)strtol(option, &first_error, 10); -- if (errno == ERANGE || *option == '\0' || *first_error != '\0') -- rcfile_error(_("Requested tab size %d invalid"), -- j); -- else -- tabsize = j; -- } -+ if (!strcasecmp(rcopts[i].name, "tabconvert")) { -+ if (errno == ERANGE || *first_error != '\0') { -+ if (*option == '\0') -+ rcfile_error(_("requested tab convert is invalid")); -+ else -+ tabconvert = option[0]; -+ } else -+ tabconvert = j; -+ } else if (!strcasecmp(rcopts[i].name, "spaceconvert")) { -+ if (errno == ERANGE || *first_error != '\0') { -+ if (*option == '\0') -+ rcfile_error(_("requested space convert is invalid")); -+ else -+ spaceconvert = option[0]; -+ } else -+ spaceconvert = j; -+ } else { -+ if (errno == ERANGE || *option == '\0' || *first_error != '\0') -+ rcfile_error(_("requested tab size %d invalid"), -+ j); -+ else -+ tabsize = j; -+ } -+ } - } else - SET(rcopts[i].flag); - #ifdef DEBUG -diff -ur nano-1.3.1.orig/src/winio.c nano-1.3.1/src/winio.c ---- nano-1.3.1.orig/src/winio.c 2004-01-10 03:04:04.138877976 -0500 -+++ nano-1.3.1/src/winio.c 2004-01-10 03:04:29.516020064 -0500 -@@ -773,11 +773,12 @@ - index = 0; - - for (; index < alloc_len; buf++) { -- if (*buf == '\t') -- do { -+ if (*buf == '\t') { -+ converted[index++] = (ISSET(WS_CONVERT) ? tabconvert : ' '); -+ while ((column + index) % tabsize) { - converted[index++] = ' '; -- } while ((column + index) % tabsize); -- else if (is_cntrl_char(*buf)) { -+ } -+ } else if (is_cntrl_char(*buf)) { - converted[index++] = '^'; - if (*buf == '\n') - /* Treat newlines embedded in a line as encoded nulls; -@@ -789,7 +790,7 @@ - else - converted[index++] = *buf + 64; - } else -- converted[index++] = *buf; -+ converted[index++] = (*buf==' '&&ISSET(WS_CONVERT)) ? spaceconvert : *buf; - } - assert(len <= alloc_len + column - start_col); - charmove(converted, converted + start_col - column, len); diff --git a/app-editors/nano/files/digest-nano-1.2.3 b/app-editors/nano/files/digest-nano-1.2.3 deleted file mode 100644 index f3167e4d0e22..000000000000 --- a/app-editors/nano/files/digest-nano-1.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 fc70be5daee7f712675ac76690f71d50 nano-1.2.3.tar.gz 964533 diff --git a/app-editors/nano/files/digest-nano-1.3.1 b/app-editors/nano/files/digest-nano-1.3.1 deleted file mode 100644 index 1d6d4dfbba38..000000000000 --- a/app-editors/nano/files/digest-nano-1.3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4f47a60a4027f22433b54e092fe61469 nano-1.3.1.tar.gz 971883 diff --git a/app-editors/nano/files/nanohupterm.patch b/app-editors/nano/files/nanohupterm.patch deleted file mode 100644 index 97e7a7717377..000000000000 --- a/app-editors/nano/files/nanohupterm.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur nano/src/nano.c nano-fixed/src/nano.c ---- nano/src/nano.c 2003-09-28 17:26:49.000000000 -0400 -+++ nano-fixed/src/nano.c 2003-09-29 01:18:16.000000000 -0400 -@@ -2852,6 +2852,12 @@ - /* Restore the terminal settings for the disabled keys */ - tcsetattr(0, TCSANOW, &oldterm); - -+ /* Trap SIGHUP and SIGTERM so we can properly deal with them while -+ suspended */ -+ act.sa_handler = handle_hupterm; -+ sigaction(SIGHUP, &act, NULL); -+ sigaction(SIGTERM, &act, NULL); -+ - /* We used to re-enable the default SIG_DFL and raise SIGTSTP, but - then we could be (and were) interrupted in the middle of the call. - So we do it the mutt way instead */ diff --git a/app-editors/nano/nano-1.2.3.ebuild b/app-editors/nano/nano-1.2.3.ebuild deleted file mode 100644 index c5107584ef54..000000000000 --- a/app-editors/nano/nano-1.2.3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.2.3.ebuild,v 1.7 2004/06/24 21:59:34 agriffis Exp $ - -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/v1.2/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64" -IUSE="nls build spell justify debug slang ncurses" - -DEPEND=">=sys-libs/ncurses-5.2 - nls? ( sys-devel/gettext ) - slang? ( sys-libs/slang )" -PROVIDE="virtual/editor" - -S=${WORKDIR}/${MY_P} - -src_compile() { - local myconf="" - use build && myconf="${myconf} --disable-wrapping-as-root" - use ncurses || myconf="${myconf} `use_with slang`" - - econf \ - --bindir=/bin \ - --enable-color \ - --enable-multibuffer \ - --enable-nanorc \ - `use_enable justify` \ - `use_enable spell` \ - `use_enable debug` \ - `use_enable nls` \ - ${myconf} \ - || die "configure failed" - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use build ; then - rm -rf ${D}/usr/share - else - cat ${FILESDIR}/nanorc-* >> nanorc.sample - dodoc ChangeLog README nanorc.sample AUTHORS BUGS NEWS TODO - dohtml *.html - insinto /etc - newins nanorc.sample nanorc - fi - - dodir /usr/bin - dosym ../../bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-1.2.4.ebuild b/app-editors/nano/nano-1.2.4.ebuild index f8b1d8ef6a07..26f76fe220e8 100644 --- a/app-editors/nano/nano-1.2.4.ebuild +++ b/app-editors/nano/nano-1.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.2.4.ebuild,v 1.1 2004/06/28 03:33:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.2.4.ebuild,v 1.2 2004/07/07 00:45:34 vapier Exp $ inherit eutils @@ -11,7 +11,7 @@ SRC_URI="http://www.nano-editor.org/dist/v1.2/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64" +KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64" IUSE="nls build spell justify debug slang ncurses" DEPEND=">=sys-libs/ncurses-5.2 diff --git a/app-editors/nano/nano-1.3.1.ebuild b/app-editors/nano/nano-1.3.1.ebuild deleted file mode 100644 index 0c0f29ef3aef..000000000000 --- a/app-editors/nano/nano-1.3.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.1.ebuild,v 1.11 2004/06/24 21:59:34 agriffis Exp $ - -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/v1.3/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa ~amd64 ~ia64 ppc64 s390" -IUSE="nls build spell justify debug slang ncurses nomac wsconvert" - -DEPEND=">=sys-libs/ncurses-5.2 - nls? ( sys-devel/gettext ) - slang? ( sys-libs/slang )" -PROVIDE="virtual/editor" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - use nomac && epatch ${FILESDIR}/${PV}-nomac.patch - use wsconvert && epatch ${FILESDIR}/${PV}-wsconvert.patch -} - -src_compile() { - local myconf="" - use build && myconf="${myconf} --disable-wrapping-as-root" - use ncurses || myconf="${myconf} `use_with slang`" - - econf \ - --bindir=/bin \ - --enable-color \ - --enable-multibuffer \ - --enable-nanorc \ - `use_enable justify` \ - `use_enable spell` \ - `use_enable debug` \ - `use_enable nls` \ - ${myconf} \ - || die "configure failed" - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use build ; then - rm -rf ${D}/usr/share - else - cat ${FILESDIR}/nanorc-* >> nanorc.sample - dodoc ChangeLog README nanorc.sample AUTHORS BUGS NEWS TODO - dohtml *.html - insinto /etc - newins nanorc.sample nanorc - fi - - dodir /usr/bin - dosym ../../bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-1.3.2.ebuild b/app-editors/nano/nano-1.3.2.ebuild index dec17ff46fdd..86117ff4af9d 100644 --- a/app-editors/nano/nano-1.3.2.ebuild +++ b/app-editors/nano/nano-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.2.ebuild,v 1.9 2004/06/30 03:24:07 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.2.ebuild,v 1.10 2004/07/07 00:45:34 vapier Exp $ inherit eutils @@ -11,7 +11,7 @@ SRC_URI="http://www.nano-editor.org/dist/v1.3/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ~ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390" +KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390" IUSE="nls build spell justify debug slang ncurses nomac wsconvert" DEPEND=">=sys-libs/ncurses-5.2 -- cgit v1.2.3-65-gdbad