summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-01-26 08:54:33 +0000
committerMike Frysinger <vapier@gentoo.org>2004-01-26 08:54:33 +0000
commitfc4cbf883691d52bca770f9ed9a2319e814d8915 (patch)
tree3a14f2d33d42303e0208e25bd548c71bca9009d2 /app-editors
parentFixes bug #39406 (diff)
downloadhistorical-fc4cbf883691d52bca770f9ed9a2319e814d8915.tar.gz
historical-fc4cbf883691d52bca770f9ed9a2319e814d8915.tar.bz2
historical-fc4cbf883691d52bca770f9ed9a2319e814d8915.zip
control mac/whitespace conversion addons
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/nano/ChangeLog5
-rw-r--r--app-editors/nano/files/1.3.1-nomac.patch25
-rw-r--r--app-editors/nano/nano-1.3.1.ebuild7
3 files changed, 33 insertions, 4 deletions
diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index b4f9758b0ece..c16bec1b1f9f 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,9 +1,12 @@
# ChangeLog for app-editors/nano
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.42 2004/01/10 08:10:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.43 2004/01/26 08:54:32 vapier Exp $
*nano-1.3.1 (10 Jan 2004)
+ 26 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+ Add local USE flags to control disabling mac output and white space converting.
+
10 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
Version bump ... should fix input routines #34628 #34817.
diff --git a/app-editors/nano/files/1.3.1-nomac.patch b/app-editors/nano/files/1.3.1-nomac.patch
new file mode 100644
index 000000000000..17a95439510b
--- /dev/null
+++ b/app-editors/nano/files/1.3.1-nomac.patch
@@ -0,0 +1,25 @@
+Only in src: .deps
+Only in src: Makefile
+Only in src: color.o
+Only in src: cut.o
+Only in src: files.o
+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
+Only in src: global.o
+Only in src: move.o
+Only in src: nano
+Only in src: nano.o
+Only in src: rcfile.o
+Only in src: search.o
+Only in src: test
+Only in src: utils.o
+Only in src: winio.o
diff --git a/app-editors/nano/nano-1.3.1.ebuild b/app-editors/nano/nano-1.3.1.ebuild
index 462502b67ac4..267fc9eb15b9 100644
--- a/app-editors/nano/nano-1.3.1.ebuild
+++ b/app-editors/nano/nano-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# 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.2 2004/01/10 08:22:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.1.ebuild,v 1.3 2004/01/26 08:54:32 vapier Exp $
inherit eutils
@@ -12,7 +12,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"
-IUSE="nls build spell justify debug slang icc"
+IUSE="nls build spell justify debug slang icc nomac wsconvert"
DEPEND=">=sys-libs/ncurses-5.2
nls? ( sys-devel/gettext )
@@ -24,7 +24,8 @@ S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
cd ${S}
-# epatch ${FILESDIR}/${PV}-wsconvert.patch
+ [ `use nomac` ] && epatch ${FILESDIR}/${PV}-nomac.patch
+ [ `use wsconvert` ] && epatch ${FILESDIR}/${PV}-wsconvert.patch
}
src_compile() {