diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-06-29 01:35:38 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-06-29 01:35:38 +0000 |
commit | eb4b7d4210ec1e676b0c94387deb82b3de41922a (patch) | |
tree | c8e025e7281e8a8d72c7a7d58a4de7c941218b80 | |
parent | many cleanups and version bumps, closes #55246 (Manifest recommit) (diff) | |
download | gentoo-2-eb4b7d4210ec1e676b0c94387deb82b3de41922a.tar.gz gentoo-2-eb4b7d4210ec1e676b0c94387deb82b3de41922a.tar.bz2 gentoo-2-eb4b7d4210ec1e676b0c94387deb82b3de41922a.zip |
ver bump
-rw-r--r-- | app-editors/nano/ChangeLog | 9 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-ifdeffix.patch | 12 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-nomac.patch | 11 | ||||
-rw-r--r-- | app-editors/nano/files/1.3.3-ws-default-off.patch | 12 | ||||
-rw-r--r-- | app-editors/nano/files/digest-nano-1.3.3 | 1 | ||||
-rw-r--r-- | app-editors/nano/nano-1.3.3.ebuild | 66 |
6 files changed, 110 insertions, 1 deletions
diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog index 4dfefb7f0d6d..870ae52b66a5 100644 --- a/app-editors/nano/ChangeLog +++ b/app-editors/nano/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/nano # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.56 2004/06/28 03:33:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.57 2004/06/29 01:35:38 vapier Exp $ + +*nano-1.3.3 (28 Jun 2004) + + 28 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/1.3.3-ifdeffix.patch, + +files/1.3.3-nomac.patch, +files/1.3.3-ws-default-off.patch, + +nano-1.3.3.ebuild: + Version bumpage. *nano-1.2.4 (27 Jun 2004) diff --git a/app-editors/nano/files/1.3.3-ifdeffix.patch b/app-editors/nano/files/1.3.3-ifdeffix.patch new file mode 100644 index 000000000000..b18d61dec679 --- /dev/null +++ b/app-editors/nano/files/1.3.3-ifdeffix.patch @@ -0,0 +1,12 @@ +diff -ur nano-1.3.3/src/global.c nano-1.3.3-fixed/src/global.c +--- nano-1.3.3/src/global.c 2004-06-22 05:03:00.000000000 +0200 ++++ nano-1.3.3-fixed/src/global.c 2004-06-29 02:24:34.000000000 +0200 +@@ -503,7 +503,7 @@ + sc_init_one(&main_list, NANO_JUSTIFY_KEY, _("Justify"), + IFHELP(nano_justify_msg, NANO_NO_KEY), + NANO_JUSTIFY_FKEY, NANO_NO_KEY, NOVIEW, +-#ifndef NANO_SMALL ++#ifndef DISABLE_JUSTIFY + do_justify_void + #else + nano_disabled_msg diff --git a/app-editors/nano/files/1.3.3-nomac.patch b/app-editors/nano/files/1.3.3-nomac.patch new file mode 100644 index 000000000000..d9d4536db545 --- /dev/null +++ b/app-editors/nano/files/1.3.3-nomac.patch @@ -0,0 +1,11 @@ +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 @@ + if (!ISSET(RESTRICTED)) { + 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); diff --git a/app-editors/nano/files/1.3.3-ws-default-off.patch b/app-editors/nano/files/1.3.3-ws-default-off.patch new file mode 100644 index 000000000000..fa4ff39ffb29 --- /dev/null +++ b/app-editors/nano/files/1.3.3-ws-default-off.patch @@ -0,0 +1,12 @@ +--- src/rcfile.c.orig 2004-06-28 21:26:01.507747496 -0400 ++++ src/rcfile.c 2004-06-28 21:26:18.512162432 -0400 +@@ -605,8 +605,7 @@ + rcfile_error(_("Two non-control characters required")); + free(whitespace); + whitespace = NULL; +- } else +- SET(WHITESPACE_DISPLAY); ++ } + } else + #endif + #ifndef DISABLE_JUSTIFY diff --git a/app-editors/nano/files/digest-nano-1.3.3 b/app-editors/nano/files/digest-nano-1.3.3 new file mode 100644 index 000000000000..aadcff3edca1 --- /dev/null +++ b/app-editors/nano/files/digest-nano-1.3.3 @@ -0,0 +1 @@ +MD5 aa458049cdede8e60cf3b868bf4c803d nano-1.3.3.tar.gz 961506 diff --git a/app-editors/nano/nano-1.3.3.ebuild b/app-editors/nano/nano-1.3.3.ebuild new file mode 100644 index 000000000000..415b89257cbd --- /dev/null +++ b/app-editors/nano/nano-1.3.3.ebuild @@ -0,0 +1,66 @@ +# 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.3.ebuild,v 1.1 2004/06/29 01:35:38 vapier 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 ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390" +IUSE="nls build spell justify debug slang ncurses nomac" + +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} + epatch ${FILESDIR}/${PV}-ws-default-off.patch + epatch ${FILESDIR}/${PV}-ifdeffix.patch + use nomac && epatch ${FILESDIR}/${PV}-nomac.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 spell` \ + `use_enable justify` \ + `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-* >> doc/nanorc.sample + dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO + dohtml *.html + insinto /etc + newins doc/nanorc.sample nanorc + fi + + dodir /usr/bin + dosym ../../bin/nano /usr/bin/nano +} |