Make vi -r work, bug #58820

4 files changed, 74 insertions, 2 deletions

diff --git a/app-editors/vi/ChangeLog b/app-editors/vi/ChangeLog
index cb58ec935727..c76875e9a4b9 100644
--- a/app-editors/vi/ChangeLog
+++ b/app-editors/vi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.30 2004/06/24 22:02:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.31 2004/08/12 19:03:56 ciaranm Exp $
+
+*vi-3.7-r6 (12 Aug 2004)
+
+  12 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> +vi-3.7-r6.ebuild:
+  Make vi -r work, bug #58820
 
   15 May 2004; Joshua Kinard <kumba@gentoo.org> vi-3.7-r5.ebuild:
   Marked stable on mips.
diff --git a/app-editors/vi/Manifest b/app-editors/vi/Manifest
index 190cb7b24bbb..7d00886cecdf 100644
--- a/app-editors/vi/Manifest
+++ b/app-editors/vi/Manifest
@@ -1,6 +1,11 @@
-MD5 7f0141f7c47d626fcd94d2233cfd2237 vi-3.7-r5.ebuild 1838
+MD5 2fdfca9e20e4dbd0331f96cf5b9b2807 vi-3.7-r3.ebuild 1313
 MD5 dde87c770648b7a0415815930a5664d2 ChangeLog 3825
 MD5 80f9d1630595865e6f30218435b8fdea vi-3.7-r4.ebuild 1806
+MD5 b188ec7763d1c0009599ce62329eeef2 vi-3.7-r6.ebuild 1630
+MD5 7f0141f7c47d626fcd94d2233cfd2237 vi-3.7-r5.ebuild 1838
+MD5 3dff3a46eb9f2c131eb03a1eb77f06b3 vi-3.7.ebuild 910
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 0b737d63b755cf984a714a72b67f1ff9 vi-3.7-r2.ebuild 1236
+MD5 25bd0a0d78a6d80250c679b3e34523ff files/digest-vi-3.7-r6 61
 MD5 ce4d692dfa7de2308c057231387e920c files/digest-vi-3.7-r4 61
 MD5 25bd0a0d78a6d80250c679b3e34523ff files/digest-vi-3.7-r5 61
diff --git a/app-editors/vi/files/digest-vi-3.7-r6 b/app-editors/vi/files/digest-vi-3.7-r6
new file mode 100644
index 000000000000..72814c8353c6
--- /dev/null
+++ b/app-editors/vi/files/digest-vi-3.7-r6
@@ -0,0 +1 @@
+MD5 701cb01666acac6427aab88ac9072a18 ex-040103.tar.gz 284130
diff --git a/app-editors/vi/vi-3.7-r6.ebuild b/app-editors/vi/vi-3.7-r6.ebuild
new file mode 100644
index 000000000000..642b6af51b93
--- /dev/null
+++ b/app-editors/vi/vi-3.7-r6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r6.ebuild,v 1.1 2004/08/12 19:03:56 ciaranm Exp $
+
+IUSE=""
+
+MY_P=ex-040103
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The original VI package"
+HOMEPAGE="http://ex-vi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ex-vi/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="Caldera"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
+
+# NOTE: vi needs /etc/termcap to function properly with TERM=linux.
+DEPEND="sys-libs/ncurses
+	sys-libs/libtermcap-compat"
+
+PROVIDE="virtual/editor"
+
+src_compile() {
+	addpredict /dev/ptys/*
+
+	# Do not use TERMLIB=ncurses, as it causes vi
+	# to segfault with TERM=linux.
+	#
+	# WARN is set in the environment in /sbin/functions.sh
+	# (unfortunately generic variable name).  Need to reset on the
+	# make command-line to keep from breaking the build.
+	make clean || die
+	make DESTDIR=/usr \
+		TERMLIB=termlib \
+		PRESERVEDIR=/var/lib/expreserve \
+		WARN='' \
+		|| die "failed compilation"
+}
+
+src_install() {
+	local l
+
+	dodir /usr/share/man
+	keepdir /var/lib/{exrecover,expreserve}
+	make INSTALL=/usr/bin/install \
+		DESTDIR=${D}/usr \
+		MANDIR=/share/man \
+		TERMLIB=termlib \
+		PRESERVEDIR=${D}/var/lib/expreserve \
+		install || die
+
+	dodoc Changes LICENSE README TODO
+
+	# By default this installs as ex with symlinks pointing to ex.
+	# To reduce conflicts with other vi programs, change the master
+	# program to vi, then point the symlinks at it.
+	cd ${D}/usr/bin
+	rm vi
+	mv ex vi
+	for l in *; do [ -L $l ] && ln -sfn vi $l; done
+	ln -s vi ex
+}