Version bump #464222 by Joe M.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

3 files changed, 193 insertions, 1 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index c038d1a6681b..fc378060b364 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.287 2013/02/21 05:32:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.288 2013/04/02 20:14:20 vapier Exp $
+
+*nano-2.3.2 (02 Apr 2013)
+
+  02 Apr 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/nano-2.3.2-bind-unbind-docs.patch, +nano-2.3.2.ebuild:
+  Version bump #464222 by Joe M.
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> nano-2.3.1-r2.ebuild:
   Add ~arm-linux keyword.
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
new file mode 100644
index 000000000000..cd7dd343f783
--- /dev/null
+++ b/app-editors/nano/files/nano-2.3.2-bind-unbind-docs.patch
@@ -0,0 +1,119 @@
+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-2.3.2.ebuild b/app-editors/nano/nano-2.3.2.ebuild
new file mode 100644
index 000000000000..25a745ce01d1
--- /dev/null
+++ b/app-editors/nano/nano-2.3.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.2.ebuild,v 1.1 2013/04/02 20:14:20 vapier Exp $
+
+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/ http://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-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)
+	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
+}