--- /usr/portage/net-mail/nmh/nmh-1.0.4-r2.ebuild	2003-02-13 09:34:59.000000000 -0500
+++ nmh-1.1_rc1.ebuild	2003-06-03 16:57:50.000000000 -0400
@@ -2,46 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-x86/net-mail/nmh/nmh-1.0.4-r2.ebuild,v 1.7 2003/02/13 14:34:59 vapier Exp $
 
-S=${WORKDIR}/${P}
+MY_P=${PN}-1.1-RC1
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="New MH mail reader"
-SRC_URI="ftp://ftp.mhost.com/pub/nmh/${P}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/nmh/${MY_P}.tar.gz"
 HOMEPAGE="http://www.mhost.com/nmh/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc sparc64"
 
 DEPEND="virtual/glibc
 	=sys-libs/db-1.85*
-	>=sys-libs/ncurses-5.2
-	app-editors/vi"
-
-# Without a valid /usr/bin/vi, the following sandbox violation is produced:
-#
-# --------------------------- ACCESS VIOLATION SUMMARY ---------------------------
-# LOG FILE = "/tmp/sandbox-nmh-1.0.4-r2-9221.log"
-#
-# open_wr:   /.nonexist-file.swp
-# open_wr:   /.nonexist-file.swp
-# open_wr:   /root/tmp/nonexist-file.swp
-# open_wr:   /root/tmp/nonexist-file.swp
-# --------------------------------------------------------------------------------
-#
-# Thus I am making vi a DEPEND until somebody with more time can figure out a
-# better way of fixing this.  NOTE:  /usr/bin/vi being a symlink to /usr/bin/vim
-# also fixes this problem.
-
+	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-	[ -z "${EDITOR}" ] && export EDITOR="/usr/bin/vi"
-	[ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
 
-	# Redifining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
+	# the use of the ${EDITOR} variable assumes the user has actually defined
+	# it and makes whatever it's set to a dependancy.  Better to just set it to
+	# nano (since everyone has _that_it) for a guranteed successful emerge and
+	# let the user set up their .mh_profile
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
-		--with-editor=${EDITOR} \
+		--with-editor=/bin/nano \
 		--with-pager=${PAGER} \
 		--enable-nmh-pop \
 		--sysconfdir=/etc/nmh \
@@ -57,4 +40,3 @@
 	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
 		MAIL.FILTERING Changelog* COPYRIGHT
 }
-