4 files changed, 77 insertions, 3 deletions
diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index c00497f11baa..1d6c8834b458 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/elvis
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.8 2003/10/01 11:39:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.9 2003/11/14 14:20:01 agriffis Exp $
+
+*elvis-2.2.0 (13 Nov 2003)
+
+  13 Nov 2003; Aron Griffis <agriffis@gentoo.org> elvis-2.2.0.ebuild:
+  Version bump to 2.2_0 for bug 32797. Note that elvis-2.1.4-keysym.patch was
+  integrated into this version, so it no longer applies.  This version bump
+  required extensive changes to the ebuild.
 
   12 Jun 2003; Aron Griffis <agriffis@gentoo.org> elvis-2.1.4-r1.ebuild,
   files/elvis-2.1.4-keysym.patch:
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 0b8fabe3caba..e1d3045910ee 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -1,7 +1,7 @@
 MD5 07a144f06f2077fd5ce8ef472665a875 elvis-2.1.4.ebuild 1029
 MD5 b9e2aa1af2876b74542824730b71496b elvis-2.1.4-r1.ebuild 1325
-MD5 d4b0ccc51258e5ff40de43595f26ff7f ChangeLog 1126
-MD5 e55c31faa203e5e55b1c087a0e92e5ed elvis-2.2.0.ebuild 1330
+MD5 0396753bc6d5933bb321a8713adaa725 ChangeLog 1427
+MD5 a2f42c834dfaf0b110c099c5ceb0e6ca elvis-2.2.0.ebuild 1777
 MD5 718daade31001ee4158c1fbf2c531845 files/elvis-2.1.4-keysym.patch 307
 MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4 64
 MD5 ba372ffdf92479b8a5d069ed732da44e files/digest-elvis-2.2.0 64
diff --git a/app-editors/elvis/elvis-2.2.0.ebuild b/app-editors/elvis/elvis-2.2.0.ebuild
new file mode 100644
index 000000000000..ccaea5eb7a7d
--- /dev/null
+++ b/app-editors/elvis/elvis-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0.ebuild,v 1.1 2003/11/14 14:20:01 agriffis Exp $
+
+inherit eutils
+
+MY_P="${PN}-2.2_0"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A vi/ex clone"
+HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="X"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	X? ( virtual/x11 )"
+PROVIDE="virtual/editor"
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--bindur=/usr/bin \
+		--datadir=/usr/share/elvis \
+		--docdir=/usr/share/doc/${PF} \
+		`use_with X x` || die 'configure failed'
+
+	# Some Makefile fixups (must happen after configure)
+	# Use our CFLAGS
+	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die 'sed 1 failed'
+
+	# We'll install the man-pages ourselves
+	sed -i -e '/^	sh instman.sh/d' Makefile || die 'sed 2 failed'
+
+	# Don't try to write to /etc
+	sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die 'sed 3 failed'
+
+	make || die 'make failed'
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodir /usr/share/elvis
+	dodir /usr/share/doc/${PF}
+	dodir /etc
+	make install \
+		PREFIX=${D}/usr \
+		BINDIR=${D}/usr/bin \
+		DATADIR=${D}/usr/share/elvis \
+		DOCDIR=${D}/usr/share/doc/${PF} || die 'make install failed'
+
+	# Install the man-pages
+	mv doc/elvis.man doc/elvis.1
+	mv doc/elvtags.man doc/elvtags.1
+	mv doc/ref.man doc/ref.1
+	doman doc/*.1 || die 'doman failed'
+
+	# Fixup some READMEs
+	sed -i -e "s,${D},,g" ${D}/etc/elvis/README \
+		|| die 'sed /etc/elvis/README failed'
+	sed -i -e "s,${D},,g" ${D}/usr/share/elvis/README \
+		|| die 'sed /usr/share/elvis/README failed'
+}
diff --git a/app-editors/elvis/files/digest-elvis-2.2.0 b/app-editors/elvis/files/digest-elvis-2.2.0
new file mode 100644
index 000000000000..d06a55ca968b
--- /dev/null
+++ b/app-editors/elvis/files/digest-elvis-2.2.0
@@ -0,0 +1 @@
+MD5 6831b8df3e4a530395e66c2889783752 elvis-2.2_0.tar.gz 1439293