epatch, sed and changelog fixes

4 files changed, 17 insertions, 20 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 5e9e330fae6a..c00497f11baa 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,6 @@
 # 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.7 2003/06/12 14:34:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.8 2003/10/01 11:39:33 aliz Exp $
 
   12 Jun 2003; Aron Griffis <agriffis@gentoo.org> elvis-2.1.4-r1.ebuild,
   files/elvis-2.1.4-keysym.patch:
@@ -24,3 +24,5 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
+*elvis-2.1.4 (15 May 2001)
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index e427a8d31329..dfbb608669b8 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -1,6 +1,6 @@
+MD5 d4b0ccc51258e5ff40de43595f26ff7f ChangeLog 1126
+MD5 ff1d246cc12ced43804a8855c60caa67 elvis-2.1.4-r1.ebuild 1405
+MD5 07a144f06f2077fd5ce8ef472665a875 elvis-2.1.4.ebuild 1029
 MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4 64
 MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4-r1 64
 MD5 718daade31001ee4158c1fbf2c531845 files/elvis-2.1.4-keysym.patch 307
-MD5 c8107e3d779dc8b8c69aea2e6775a90c elvis-2.1.4-r1.ebuild 1502
-MD5 532ee555d55a66fe907eb6972aa2bada elvis-2.1.4.ebuild 1172
-MD5 c60d556518aeb358137826275c3403ff ChangeLog 1102
diff --git a/app-editors/elvis/elvis-2.1.4-r1.ebuild b/app-editors/elvis/elvis-2.1.4-r1.ebuild
index ad14289f4acf..2d11780fd433 100644
--- a/app-editors/elvis/elvis-2.1.4-r1.ebuild
+++ b/app-editors/elvis/elvis-2.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.4-r1.ebuild,v 1.16 2003/08/05 15:08:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4-r1.ebuild,v 1.17 2003/10/01 11:39:33 aliz Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ MY_P="${PN}-2.1_4"
 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/${PN}/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
@@ -47,13 +47,11 @@ src_compile() {
 }
 
 src_install() {
-	cp instman.sh instman.sh.orig
-	sed -e "s:/usr/man:${D}/usr/share/man:g" instman.sh.orig > instman.sh
+	sed -i -e "s:/usr/man:${D}/usr/share/man:g" instman.sh
 
-	cp insticon.sh insticon.sh.orig
-	sed -e "s:^xinc=.*$:xinc=${D}/usr/include:" \
+	sed -i -e "s:^xinc=.*$:xinc=${D}/usr/include:" \
 	 -e "s:^xlib=.*$:xlib=${D}/usr/lib:" \
-		insticon.sh.orig > insticon.sh
+		insticon.sh
 
 	dodir /usr/bin
 	dodir /usr/share/man/man1
diff --git a/app-editors/elvis/elvis-2.1.4.ebuild b/app-editors/elvis/elvis-2.1.4.ebuild
index 6ca825db417a..5c0fc162f69c 100644
--- a/app-editors/elvis/elvis-2.1.4.ebuild
+++ b/app-editors/elvis/elvis-2.1.4.ebuild
@@ -1,12 +1,12 @@
 # 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.1.4.ebuild,v 1.13 2003/08/05 15:08:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4.ebuild,v 1.14 2003/10/01 11:39:33 aliz Exp $
 
 MY_P="${PN}-2.1_4"
 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/${PN}/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
@@ -27,19 +27,16 @@ src_compile() {
 		--datadir=${D}/usr/share/elvis \
 		${myconf} || die
 
-	cp Makefile Makefile.orig
-	cat Makefile.orig | sed -e "s:gcc -O2:gcc ${CFLAGS}:" > Makefile
+	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile
 	make || die
 }
 
 src_install() {
-	cp instman.sh instman.sh.orig
-	sed -e "s:/usr/man:${D}/usr/share/man:g" instman.sh.orig > instman.sh
+	sed -i -e "s:/usr/man:${D}/usr/share/man:g" instman.sh
 
-	cp insticon.sh insticon.sh.orig
-	sed -e "s:^xinc=.*$:xinc=${D}/usr/include:" \
+	sed -i -e "s:^xinc=.*$:xinc=${D}/usr/include:" \
 	 -e "s:^xlib=.*$:xlib=${D}/usr/lib:" \
-		insticon.sh.orig > insticon.sh
+		insticon.sh
 
 	dodir /usr/bin
 	dodir /usr/share/man/man1