text will, by default, not be wrapped in the build and bootcd environments

12 files changed, 19 insertions, 170 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index b0b9845994af..8ba854ca5f87 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/nano
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.3 2002/03/12 13:22:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.4 2002/04/12 02:48:06 seemant Exp $
+
+	11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> nano-1.0.8-r1.ebuild :
+
+	I did not bump the revision number of this, but I added a flag to 
+	disable text wrapping as root, for when nano is built for the bootcd
+	or build environments.  This means that the nano -w instruction in
+	our Gentoo Installation docs will need to be adjusted to just say
+	"nano" now.  Thanks to chrisa@asty.org (Chris Allegretta) in bug
+	# 1565
 
 *nano-1.0.8-r1 (12 Mar 2002)
 	
diff --git a/app-editors/nano/files/digest-nano-1.0.3-r1 b/app-editors/nano/files/digest-nano-1.0.3-r1
deleted file mode 100644
index c33d27bad10b..000000000000
--- a/app-editors/nano/files/digest-nano-1.0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 520a7d3330485cd747d0ebfd48a3fd57 nano-1.0.3.tar.gz 396615
diff --git a/app-editors/nano/files/digest-nano-1.0.4 b/app-editors/nano/files/digest-nano-1.0.4
deleted file mode 100644
index 875c1628d03f..000000000000
--- a/app-editors/nano/files/digest-nano-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e48f0c030f30ef279cb37c7e046a9b14 nano-1.0.4.tar.gz 413951
diff --git a/app-editors/nano/files/digest-nano-1.0.5 b/app-editors/nano/files/digest-nano-1.0.5
deleted file mode 100644
index 97a664c73e29..000000000000
--- a/app-editors/nano/files/digest-nano-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6673330d15c1d08d826215e8fefe443a nano-1.0.5.tar.gz 426670
diff --git a/app-editors/nano/files/digest-nano-1.0.6 b/app-editors/nano/files/digest-nano-1.0.6
deleted file mode 100644
index 2a949e172b0d..000000000000
--- a/app-editors/nano/files/digest-nano-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01db121b6f4645480af29d3926a4b662 nano-1.0.6.tar.gz 430318
diff --git a/app-editors/nano/files/digest-nano-1.0.8 b/app-editors/nano/files/digest-nano-1.0.8
deleted file mode 100644
index ad1304006d85..000000000000
--- a/app-editors/nano/files/digest-nano-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84743b50f839013b6bba654c7ae707bc nano-1.0.8.tar.gz 439253
diff --git a/app-editors/nano/nano-1.0.3-r1.ebuild b/app-editors/nano/nano-1.0.3-r1.ebuild
deleted file mode 100644
index 3bc0f27b7f9b..000000000000
--- a/app-editors/nano/nano-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Prakash Shetty (Crux) <ps@gnuos.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.3-r1.ebuild,v 1.5 2001/08/13 20:09:39 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A Clone of PICO with more Fuctions in a smaller Size"
-#SRC_URI="http://www.nano-editor.org/dist/v1.0/${A}"
-SRC_URI="http://www.nano-editor.org/dist/v1.0/${P}.tar.gz"
-HOMEPAGE="http://www.nano-editor.org"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-    cd ${S}
-	try ./configure --prefix=/usr --enable-extra --mandir=/usr/share/man --infodir=/usr/share/info
-	try make
-}
-
-src_install () {
-    cd ${S}
-    try make DESTDIR=${D} install
-	if [ -z "`use bootcd`" ] && [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog README
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/app-editors/nano/nano-1.0.4.ebuild b/app-editors/nano/nano-1.0.4.ebuild
deleted file mode 100644
index c554a9d0ba6d..000000000000
--- a/app-editors/nano/nano-1.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Prakash Shetty (Crux) <ps@gnuos.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.4.ebuild,v 1.1 2001/08/26 10:15:11 pm Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A Clone of PICO with more Fuctions in a smaller Size"
-#SRC_URI="http://www.nano-editor.org/dist/v1.0/${A}"
-SRC_URI="http://www.nano-editor.org/dist/v1.0/${P}.tar.gz"
-HOMEPAGE="http://www.nano-editor.org"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-    cd ${S}
-	try ./configure --prefix=/usr --enable-extra --mandir=/usr/share/man \
-	--infodir=/usr/share/info
-	try make
-}
-
-src_install () {
-    cd ${S}
-    try make DESTDIR=${D} install
-	if [ -z "`use bootcd`" ] && [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog README
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/app-editors/nano/nano-1.0.5.ebuild b/app-editors/nano/nano-1.0.5.ebuild
deleted file mode 100644
index c7b7b1ab1e89..000000000000
--- a/app-editors/nano/nano-1.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.5.ebuild,v 1.1 2001/10/04 03:33:33 pm Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A Clone of PICO with more Fuctions in a smaller Size"
-#SRC_URI="http://www.nano-editor.org/dist/v1.0/${A}"
-SRC_URI="http://www.nano-editor.org/dist/v1.0/${P}.tar.gz"
-HOMEPAGE="http://www.nano-editor.org"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-    cd ${S}
-	try ./configure --prefix=/usr --enable-extra --mandir=/usr/share/man \
-	--infodir=/usr/share/info
-	try make
-}
-
-src_install () {
-    cd ${S}
-    try make DESTDIR=${D} install
-	if [ -z "`use bootcd`" ] && [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog README
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/app-editors/nano/nano-1.0.6.ebuild b/app-editors/nano/nano-1.0.6.ebuild
deleted file mode 100644
index 2f43a792876a..000000000000
--- a/app-editors/nano/nano-1.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.6.ebuild,v 1.1 2001/11/07 05:44:32 pm Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A Clone of PICO with more Fuctions in a smaller Size"
-#SRC_URI="http://www.nano-editor.org/dist/v1.0/${A}"
-SRC_URI="http://www.nano-editor.org/dist/v1.0/${P}.tar.gz"
-HOMEPAGE="http://www.nano-editor.org"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-    cd ${S}
-	try ./configure --prefix=/usr --enable-extra --mandir=/usr/share/man \
-	--infodir=/usr/share/info
-	try make
-}
-
-src_install () {
-    cd ${S}
-    try make DESTDIR=${D} install
-	if [ -z "`use bootcd`" ] && [ -z "`use build`" ]
-	then
-		dodoc COPYING ChangeLog README
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/app-editors/nano/nano-1.0.8-r1.ebuild b/app-editors/nano/nano-1.0.8-r1.ebuild
index 6acfbeb72050..c219b26f29bf 100644
--- a/app-editors/nano/nano-1.0.8-r1.ebuild
+++ b/app-editors/nano/nano-1.0.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.8-r1.ebuild,v 1.1 2002/03/12 13:22:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.8-r1.ebuild,v 1.2 2002/04/12 02:48:06 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="clone of Pico with more functions in a smaller size"
@@ -18,6 +18,10 @@ src_compile() {
 
 	use slang && myconf="${myconf} --with-slang"
 	use nls   || myconf="${myconf} --disable-nls"
+	
+	if use bootcd || use build ; then
+		myconf="${myconf} --disable-wrapping-as-root"
+	fi
 
 	./configure \
 		--build=${CHOST} \
@@ -31,7 +35,10 @@ src_compile() {
 }
 
 src_install () {
-    make DESTDIR=${D} install || die
+    make 	\
+		DESTDIR=${D} 	\
+		install || die
+
 	if use bootcd || use build; then
 		rm -rf ${D}/usr/share
 	else
diff --git a/app-editors/nano/nano-1.0.8.ebuild b/app-editors/nano/nano-1.0.8.ebuild
deleted file mode 100644
index f5112bec131d..000000000000
--- a/app-editors/nano/nano-1.0.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.8.ebuild,v 1.1 2002/02/20 16:09:43 agriffis Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="clone of Pico with more functions in a smaller size"
-SRC_URI="http://www.nano-editor.org/dist/v1.0/${P}.tar.gz"
-HOMEPAGE="http://www.nano-editor.org/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
-	slang? ( >=sys-libs/slang-1.4.4-r1 )"
-
-src_compile() {
-	local myflags
-	if use slang; then
-		myflags="--with-slang"
-	else
-		myflags="--without-slang"
-	fi
-	./configure \
-		--build=${CHOST} \
-		--prefix=/usr \
-		--enable-extra \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		${myflags} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-    make DESTDIR=${D} install || die
-	if use bootcd || use build; then
-		rm -rf ${D}/usr/share
-	else
-		dodoc COPYING ChangeLog README
-	fi
-}