ver bump

7 files changed, 119 insertions, 5 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/Manifest b/app-editors/nano/Manifest
index d39a5f7f6332..5fd9ec5e86d7 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1b5fbc75b4d6a9ef3724324dd78cd280 ChangeLog 6280
+MD5 c68897d2bbab98b7abf219d0dc74c98c ChangeLog 6491
 MD5 b297797b490f7c6ca8d5f40f2d6347cc metadata.xml 1015
 MD5 c570103a8d071f029f0c28c5814e78a3 nano-1.2.4.ebuild 1406
 MD5 13215fa30da22e004cb8107b25c5d216 nano-1.2.3.ebuild 1399
 MD5 7ba7b3945513a241a5f9a782bf363ebc nano-1.3.2.ebuild 1592
+MD5 cf1526b923a78491f277a9cd02fd058f nano-1.3.3.ebuild 1616
 MD5 11f35ad90cb7fe932129955d9469b6ab nano-1.3.1.ebuild 1580
 MD5 5a223e97f96e6952e3f345f4ae504772 files/nanorc-man 305
+MD5 41f48da10c4f45b989d2bcffe83b58fd files/digest-nano-1.3.3 62
 MD5 0726e5da362828bb5b1a73e5bd944849 files/1.3.1-nomac.patch 553
 MD5 bbdbc4c41e290e7658f6a6d06b3ac6f4 files/digest-nano-1.2.4 62
 MD5 32af719cc97d13c5e5946c86d80112da files/digest-nano-1.2.3 62
 MD5 b3cb388c0c523217fcf2e4b6dfe8bbd9 files/digest-nano-1.3.2 62
+MD5 8cae7c25770d1934c483be3b58f2eae7 files/1.3.3-nomac.patch 550
 MD5 0726e5da362828bb5b1a73e5bd944849 files/1.3.2-nomac.patch 553
 MD5 148b57588079ffd0ed1a9a9f53bca7ba files/nanohupterm.patch 689
 MD5 8e2826d298e32d2c2875170144d53b86 files/nanorc-gentoo 1824
@@ -20,10 +23,12 @@ MD5 9ecacdb9e41a6ddb3200113238ca4b2b files/nanorc-sh 646
 MD5 404022ef3ea1c5600e41f2ea8e10e6be files/1.3.1-wsconvert.patch 6900
 MD5 85969a2fa1deb57366338d9b82be3b74 files/digest-nano-1.3.1 62
 MD5 740ee1dff171c4230019d04c3fcac1d3 files/1.3.2-wsconvert.patch 6900
+MD5 f7b62387fee9c47b2bf7b790642f4d34 files/1.3.3-ifdeffix.patch 455
+MD5 bfa78f95b6154fd47d2b021f60829456 files/1.3.3-ws-default-off.patch 352
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFA35GZHTu7gpaalycRAtlJAJ9uvblQg618ViCZ+b5GdSUA6ses/wCg9WHH
-IpcuygSg3gKc5m/CLj2KdmQ=
-=7+Zi
+iD8DBQFA4MeCHTu7gpaalycRAvbxAKCHqXDLyvR2Bzs+WLiU+ugP+Z4BaACg9QZ6
+8FQAquyOeMKgiRPQoMpwmRk=
+=0kH7
 -----END PGP SIGNATURE-----
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
+}