version bump thanks to: Andrew Minter <agm@masarand.com> and Gunnar Ritter <Gunnar.Ritter@pluto.uni-freiburg.de> via e-mail. This version should be able to read the new termcap file format (but it doesn't for me :/).

6 files changed, 34 insertions, 68 deletions

diff --git a/app-editors/vi/ChangeLog b/app-editors/vi/ChangeLog
index 888a77765b0a..b2cabd0c1264 100644
--- a/app-editors/vi/ChangeLog
+++ b/app-editors/vi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/vi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.18 2003/10/31 19:20:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.19 2004/01/04 17:13:09 seemant Exp $
+
+*vi-3.7-r5 (04 Jan 2004)
+
+  04 Jan 2004; Seemant Kulleen <seemant@gentoo.org> vi-3.7-r2.ebuild,
+  vi-3.7-r3.ebuild, vi-3.7-r4.ebuild, vi-3.7-r5.ebuild:
+  version bump thanks to: Andrew Minter <agm@masarand.com> and Gunnar Ritter
+  <Gunnar.Ritter@pluto.uni-freiburg.de> via e-mail. This version should be able
+  to read the new termcap file format (but it doesn't for me :/).
 
   20 Aug 2003; Aron Griffis <agriffis@gentoo.org> metadata.xml:
   Put this package in the vim herd
diff --git a/app-editors/vi/Manifest b/app-editors/vi/Manifest
index 32f5609ee2f5..69a2ca77ae27 100644
--- a/app-editors/vi/Manifest
+++ b/app-editors/vi/Manifest
@@ -1,6 +1,6 @@
-MD5 645c5b290c5854c35e53b0676acfb478 vi-3.7-r5.ebuild 1844
-MD5 c843f023f42e1ec7830647d5b00fde80 ChangeLog 2427
-MD5 9d7d2dd35e173e051939491ab9815e2d vi-3.7-r4.ebuild 1818
+MD5 98be8977c3e286c7d5faa896749c3a12 vi-3.7-r5.ebuild 1845
+MD5 4e0d7ef655ce038ee1b056ab851a8302 ChangeLog 2804
+MD5 92382b2e9474a9b2bcdcdf4803d720f5 vi-3.7-r4.ebuild 1819
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 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-r5 b/app-editors/vi/files/digest-vi-3.7-r5
new file mode 100644
index 000000000000..72814c8353c6
--- /dev/null
+++ b/app-editors/vi/files/digest-vi-3.7-r5
@@ -0,0 +1 @@
+MD5 701cb01666acac6427aab88ac9072a18 ex-040103.tar.gz 284130
diff --git a/app-editors/vi/vi-3.7-r2.ebuild b/app-editors/vi/vi-3.7-r2.ebuild
deleted file mode 100644
index a55f78839dee..000000000000
--- a/app-editors/vi/vi-3.7-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 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-r2.ebuild,v 1.8 2003/09/05 23:05:05 msterret 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"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="sys-libs/ncurses"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-	addpredict /dev/ptys/*
-
-	make DESTDIR=/usr \
-		TERMLIB=termlib \
-		PRESERVEDIR=/var/preserve \
-		|| die "failed compilation"
-}
-
-src_install() {
-	dodir /var/preserve /usr/share/man
-	make INSTALL=/usr/bin/install \
-		DESTDIR=${D}/usr \
-		MANDIR=/share/man \
-		PRESERVEDIR=${D}/var/preserve \
-		TERMLIB=termlib \
-		install || die
-
-	dodoc Changes LICENSE README TODO
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" = "/" ] && [ ! -f /etc/termcap ]
-	then
-		ewarn "vi needs /etc/termcap, so please install the latest"
-		ewarn "baselaout (if 1.8.1 is released yet), or get it from:"
-		ewarn ""
-		ewarn "http://www.ibiblio.org/gentoo/distfiles/termcap.bz2"
-		ewarn ""
-		ewarn "and install it in /etc with permissions 0644."
-	fi
-}
-
diff --git a/app-editors/vi/vi-3.7-r4.ebuild b/app-editors/vi/vi-3.7-r4.ebuild
index f45684fea321..b06e3813dff4 100644
--- a/app-editors/vi/vi-3.7-r4.ebuild
+++ b/app-editors/vi/vi-3.7-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r4.ebuild,v 1.3 2003/10/31 19:20:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r4.ebuild,v 1.4 2004/01/04 17:13:09 seemant Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ KEYWORDS="x86 ppc sparc arm mips alpha hppa"
 
 # NOTE: vi needs /etc/termcap to function properly with TERM=linux.
 DEPEND="sys-libs/ncurses
-	sys-libs/libtermcap-compat"
+	=sys-libs/libtermcap-compat-1.2.3*"
 
 PROVIDE="virtual/editor"
 
diff --git a/app-editors/vi/vi-3.7-r3.ebuild b/app-editors/vi/vi-3.7-r5.ebuild
index 1e48088a1031..1645a0a2dd11 100644
--- a/app-editors/vi/vi-3.7-r3.ebuild
+++ b/app-editors/vi/vi-3.7-r5.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.11 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r5.ebuild,v 1.1 2004/01/04 17:13:09 seemant Exp $
 
 IUSE=""
 
-MY_P=ex-020403
+MY_P=ex-040103
 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"
+SRC_URI="http://ex-vi.berlios.de/archive/${MY_P}.tar.gz"
 SLOT="0"
-KEYWORDS="x86 ppc sparc arm mips alpha"
+LICENSE="Caldera"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64 ~ppc64"
 
 # NOTE: vi needs /etc/termcap to function properly with TERM=linux.
 DEPEND="sys-libs/ncurses
-	sys-libs/libtermcap-compat"
+	>=sys-libs/libtermcap-compat-2.0.8"
 
 PROVIDE="virtual/editor"
 
@@ -38,6 +38,8 @@ src_compile() {
 }
 
 src_install() {
+	local l
+
 	dodir /usr/share/man
 	keepdir /var/lib/{exrecover,expreserve}
 	make INSTALL=/usr/bin/install \
@@ -50,5 +52,13 @@ src_install() {
 		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
+}