add libtermcap-compat dep

6 files changed, 55 insertions, 72 deletions

diff --git a/app-editors/vi/ChangeLog b/app-editors/vi/ChangeLog
index f183b9765a8d..aeb16a6e6386 100644
--- a/app-editors/vi/ChangeLog
+++ b/app-editors/vi/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for <CATEGORY>/<PACKAGE_NAME>
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.5 2002/08/07 17:54:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.6 2002/09/05 07:37:22 azarah Exp $
 
-*vi-3.7-r1 (06 Aug 2002)
+*vi-3.7-r3 (05 Sep 2002)
+
+  05 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add libtermcap-compat to DEPEND.
+
+*vi-3.7-r2 (06 Aug 2002)
 
   06 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
   Change it to use the buildin termlib instead of ncurses.  This should
diff --git a/app-editors/vi/files/digest-vi-3.7-r1 b/app-editors/vi/files/digest-vi-3.7-r1
deleted file mode 100644
index 7e51cfd075bf..000000000000
--- a/app-editors/vi/files/digest-vi-3.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 544e5014f8fe8674ec3bcedd30815582 ex-020403.tar.gz 216587
diff --git a/app-editors/vi/files/digest-vi-3.7 b/app-editors/vi/files/digest-vi-3.7-r3
index 7e51cfd075bf..7e51cfd075bf 100644
--- a/app-editors/vi/files/digest-vi-3.7
+++ b/app-editors/vi/files/digest-vi-3.7-r3
diff --git a/app-editors/vi/vi-3.7-r1.ebuild b/app-editors/vi/vi-3.7-r1.ebuild
deleted file mode 100644
index 79deffaeb0de..000000000000
--- a/app-editors/vi/vi-3.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r1.ebuild,v 1.4 2002/08/14 18:36:03 murphy Exp $
-
-MY_P=ex-020403
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The original VI package"
-SRC_URI="http://download.berlios.de/ex-vi/${MY_P}.tar.gz"
-HOMEPAGE="http://ex-vi.berlios.de/"
-LICENSE="Caldera"
-DEPEND="virtual/glibc sys-libs/ncurses"
-SLOT="0"
-RDEPEND=$DEPEND
-KEYWORDS="x86 ppc sparc sparc64"
-
-src_compile() {
-
-	addpredict /dev/ptys/*
-
-	make DESTDIR=/usr \
-		TERMLIB=ncurses \
-		PRESERVEDIR=/var/preserve || die "failed compilation"
-}
-
-src_install () {
-	dodir /var/preserve
-	dodir /usr/share/man
-	make INSTALL=/usr/bin/install \
-		DESTDIR=${D}/usr \
-		MANDIR=/share/man \
-		PRESERVEDIR=${D}/var/preserve \
-		TERMLIB=ncurses \
-		install || die
-	dodoc Changes LICENSE README TODO
-}
diff --git a/app-editors/vi/vi-3.7-r3.ebuild b/app-editors/vi/vi-3.7-r3.ebuild
new file mode 100644
index 000000000000..3a89b85bace0
--- /dev/null
+++ b/app-editors/vi/vi-3.7-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r3.ebuild,v 1.1 2002/09/05 07:37:22 azarah Exp $
+
+# NOTE: vi needs /etc/termcap to function properly with TERM=linux.
+
+MY_P=ex-020403
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="The original VI package"
+SRC_URI="http://download.berlios.de/ex-vi/${MY_P}.tar.gz"
+HOMEPAGE="http://ex-vi.berlios.de/"
+
+LICENSE="Caldera"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64"
+
+DEPEND="virtual/glibc
+	sys-libs/ncurses
+	sys-libs/libtermcap-compat"
+
+src_compile() {
+	addpredict /dev/ptys/*
+
+	# Do not use TERMLIB=ncurses, as it causes vi
+	# to segfault with TERM=linux.
+	make DESTDIR=/usr \
+		TERMLIB=termlib \
+		PRESERVEDIR=/var/lib/expreserve \
+		RECOVER="-DEXRECOVER=\\\"/var/lib/exrecover\\\" \
+		         -DEXPRESERVE=\\\"/var/lib/expreserve\\\"" \
+		|| die "failed compilation"
+}
+
+src_install() {
+	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 \
+		RECOVER="-DEXRECOVER=\\\"/var/lib/exrecover\\\" \
+		         -DEXPRESERVE=\\\"/var/lib/expreserve\\\"" \
+		install || die
+	
+	dodoc Changes LICENSE README TODO
+}
+
diff --git a/app-editors/vi/vi-3.7.ebuild b/app-editors/vi/vi-3.7.ebuild
deleted file mode 100644
index 1e3a9a944543..000000000000
--- a/app-editors/vi/vi-3.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7.ebuild,v 1.5 2002/08/14 18:36:03 murphy Exp $
-
-MY_P=ex-020403
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="The original VI package"
-SRC_URI="http://download.berlios.de/ex-vi/${MY_P}.tar.gz"
-HOMEPAGE="http://ex-vi.berlios.de/"
-LICENSE="Caldera"
-DEPEND="virtual/glibc sys-libs/ncurses"
-SLOT="0"
-RDEPEND=$DEPEND
-KEYWORDS="x86 ppc sparc sparc64"
-
-src_compile() {
-	make DESTDIR=/usr \
-		TERMLIB=ncurses \
-		PRESERVEDIR=/var/preserve || die "failed compilation"
-}
-
-src_install () {
-	dodir /var/preserve
-	dodir /usr/share/man
-	make INSTALL=/usr/bin/install \
-		DESTDIR=${D}/usr \
-		MANDIR=/share/man \
-		PRESERVEDIR=${D}/var/preserve \
-		TERMLIB=ncurses \
-		install || die
-	dodoc Changes LICENSE README TODO
-}