Mark myself as maintainer and add an ebuild for 1.79

(Portage version: 2.1.1_pre3-r3)

6 files changed, 156 insertions, 2 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 4d8d9efb6be8..a27384d89aaf 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/nvi
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.23 2005/02/10 15:03:29 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.24 2006/07/23 10:50:14 truedfx Exp $
+
+*nvi-1.79 (23 Jul 2006)
+
+  23 Jul 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/nvi-1.79-build.patch, +metadata.xml, +nvi-1.79.ebuild:
+  Add 1.79 as 1.8* don't build with GCC4
+  Mark myself as maintainer
 
   10 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org> nvi-1.81.4.ebuild,
   nvi-1.81.5-r1.ebuild, nvi-1.81.5-r2.ebuild, nvi-1.81.5.ebuild:
diff --git a/app-editors/nvi/files/digest-nvi-1.79 b/app-editors/nvi/files/digest-nvi-1.79
new file mode 100644
index 000000000000..796ce0673594
--- /dev/null
+++ b/app-editors/nvi/files/digest-nvi-1.79
@@ -0,0 +1,3 @@
+MD5 765e2153f5fc4f21793f2edc2647305a nvi-1.79.tar.gz 1295401
+RMD160 1c39d480e0d30a87fc061c3219354b50011a8621 nvi-1.79.tar.gz 1295401
+SHA256 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33 nvi-1.79.tar.gz 1295401
diff --git a/app-editors/nvi/files/digest-nvi-1.81.4 b/app-editors/nvi/files/digest-nvi-1.81.4
index 612eb11fd7c7..4599378e0eac 100644
--- a/app-editors/nvi/files/digest-nvi-1.81.4
+++ b/app-editors/nvi/files/digest-nvi-1.81.4
@@ -1 +1,3 @@
 MD5 5826bdceb43cb3787ee89ef57de033f6 nvi-1.81.4.tar.gz 1514011
+RMD160 7c5f9aca3b1fbce3fa71873b4827dc5685e8afeb nvi-1.81.4.tar.gz 1514011
+SHA256 3d5a1fcccd246dad4650081336767b43ca47f25dcbb4c7cc8496a4fd5d3f33f1 nvi-1.81.4.tar.gz 1514011
diff --git a/app-editors/nvi/files/nvi-1.79-build.patch b/app-editors/nvi/files/nvi-1.79-build.patch
new file mode 100644
index 000000000000..66bccf756506
--- /dev/null
+++ b/app-editors/nvi/files/nvi-1.79-build.patch
@@ -0,0 +1,75 @@
+--- nvi-1.79/build/Makefile.in
++++ nvi-1.79/build/Makefile.in
+@@ -75,7 +75,7 @@
+ transform=@program_transform_name@
+ 
+ install: all install_common
+-	@echo "Installing vi, ex, view: $(bindir) ..."
++	@echo "Installing nvi: $(bindir) ..."
+ 	[ -d $(bindir) ] || \
+ 	    ($(mkdir) $(bindir) && $(chmod) $(dmode) $(bindir))
+ 	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+@@ -83,41 +83,16 @@
+ 	cd $(bindir) && [ -f $(strip) ] && \
+ 	    $(strip) `echo vi | sed '$(transform)'`
+ 	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
+-	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+-	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+-	cd $(bindir) && $(ln) \
+-		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+-	cd $(bindir) && $(ln) \
+-		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+ 	[ -d $(mandir) ] || \
+ 	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
+-	[ -d $(mandir)/cat1 ] || \
+-	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
+ 	@echo "Installing man pages: $(mandir) ..."
+-	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+-	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
+-	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(ln) \
+-	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(ln) \
+-	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+ 	[ -d $(mandir)/man1 ] || \
+ 	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
+ 	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+ 	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.1 \
+ 	    $(mandir)/man1/`echo vi.1 | sed '$(transform)'`
+ 	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(ln) \
+-	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(ln) \
+-	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
+ 
+-cat=	dutch english french german ru_SU.KOI8-R spanish swedish
+ install_common:
+ 	[ -f $(chmod) ]
+ 	[ -f $(cp) ]
+@@ -132,21 +107,6 @@
+ 	    ($(mkdir) $(datadir) && $(chmod) $(dmode) $(datadir))
+ 	$(rm) -rf $(datadir)/vi
+ 	$(mkdir) $(datadir)/vi && $(chmod) $(dmode) $(datadir)/vi
+-	@echo "Installing message catalogs: $(datadir)/vi/catalog ..."
+-	$(mkdir) $(datadir)/vi/catalog && \
+-	    $(chmod) $(dmode) $(datadir)/vi/catalog
+-	(cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \
+-	    cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
+-	@echo "Installing Perl scripts: $(datadir)/vi/perl ..."
+-	$(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
+-	[ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
+-	    cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
+-	(cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
+-	    cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
+-	@echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
+-	$(mkdir) $(datadir)/vi/tcl && $(chmod) $(dmode) $(datadir)/vi/tcl
+-	(cd $(srcdir)/tcl_scripts && $(cp) *.tcl $(datadir)/vi/tcl && \
+-	    cd $(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl)
+ 	@echo "Installing recover script: $(datadir)/vi/recover ..."
+ 	($(cp) recover $(datadir)/vi/recover && \
+ 	    $(chmod) $(emode) $(datadir)/vi/recover)
diff --git a/app-editors/nvi/metadata.xml b/app-editors/nvi/metadata.xml
new file mode 100644
index 000000000000..8e3ec1a80788
--- /dev/null
+++ b/app-editors/nvi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>truedfx@gentoo.org</email>
+<name>Harald van Dijk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-editors/nvi/nvi-1.79.ebuild b/app-editors/nvi/nvi-1.79.ebuild
new file mode 100644
index 000000000000..8a41f0883eab
--- /dev/null
+++ b/app-editors/nvi/nvi-1.79.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.79.ebuild,v 1.1 2006/07/23 10:50:14 truedfx Exp $
+
+inherit eutils
+
+DESCRIPTION="Vi clone"
+HOMEPAGE="http://www.bostic.com/vi/"
+SRC_URI="ftp://ftp.sleepycat.com/pub/${P}.tar.gz"
+
+LICENSE="Sleepycat"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-editors/vim
+	!app-editors/gvim"
+PROVIDE="virtual/editor"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	# Fix bug 23888
+	epatch "${FILESDIR}"/${PN}-1.81.5-tcsetattr.patch
+}
+
+src_compile() {
+	cd build
+	econf --program-prefix=n \
+		--disable-curses \
+		--disable-re \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	cd build
+	einstall || die "install failed"
+}
+
+pkg_postinst() {
+	[[ ! -e "${ROOT}"/usr/bin/vi ]] &&
+		ln -sf nvi "${ROOT}"/usr/bin/vi
+	[[ ! -e "${ROOT}"/usr/bin/ex ]] &&
+		ln -sf nvi "${ROOT}"/usr/bin/ex
+	[[ ! -e "${ROOT}"/usr/bin/view ]] &&
+		ln -sf nvi "${ROOT}"/usr/bin/view
+}
+
+pkg_postrm() {
+	[[ -L "${ROOT}"/usr/bin/vi && ! -f "${ROOT}"/usr/bin/vi ]] &&
+		rm -f "${ROOT}"/usr/bin/vi
+	[[ -L "${ROOT}"/usr/bin/ex && ! -f "${ROOT}"/usr/bin/ex ]] &&
+		rm -f "${ROOT}"/usr/bin/ex
+	[[ -L "${ROOT}"/usr/bin/view && ! -f "${ROOT}"/usr/bin/view ]] &&
+		rm -f "${ROOT}"/usr/bin/view
+}