epatch, sed and changelog fixes

29 files changed, 101 insertions, 112 deletions

diff --git a/app-editors/beaver/Manifest b/app-editors/beaver/Manifest
index dc8da1b0be0b..0a30de57b29e 100644
--- a/app-editors/beaver/Manifest
+++ b/app-editors/beaver/Manifest
@@ -1,7 +1,7 @@
+MD5 3f23f7e29e7dfba1088e48fda777f33e ChangeLog 987
+MD5 e5f8e15beeca4a9d054b0428c926f980 beaver-0.2.3.ebuild 875
+MD5 333056d1dec803b01bd884432e0575fb beaver-0.2.4.ebuild 853
+MD5 7d819cb84ce53ed035b286b8420ef870 beaver-0.2.6.ebuild 628
 MD5 ce9a23ce30d328c0b4c4088c0f7c498d files/digest-beaver-0.2.3 64
 MD5 94bbd5b2ce29e99e5cafed9c7601ec22 files/digest-beaver-0.2.4 64
 MD5 37eae8b19ad2c101b55ebed07db7e0f6 files/digest-beaver-0.2.6 64
-MD5 3ee996fdff521e7110ec0a60d847f96a beaver-0.2.3.ebuild 917
-MD5 255697c00a0823a82b7fbfde4e2188b1 beaver-0.2.4.ebuild 895
-MD5 3f23f7e29e7dfba1088e48fda777f33e ChangeLog 987
-MD5 7d819cb84ce53ed035b286b8420ef870 beaver-0.2.6.ebuild 628
diff --git a/app-editors/beaver/beaver-0.2.3.ebuild b/app-editors/beaver/beaver-0.2.3.ebuild
index 145071dcc499..a5df7e50af4a 100644
--- a/app-editors/beaver/beaver-0.2.3.ebuild
+++ b/app-editors/beaver/beaver-0.2.3.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/beaver/beaver-0.2.3.ebuild,v 1.7 2003/02/13 06:38:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/beaver/beaver-0.2.3.ebuild,v 1.8 2003/10/01 11:39:33 aliz Exp $
 
 P=beaver-0.2.3
 S=${WORKDIR}/${P}
@@ -22,9 +22,8 @@ src_unpack() {
 
 	cd ${S}/src
 
-	cp Makefile Makefile.orig
-	sed -e "s:DESTDIR = /usr/local:DESTDIR = /usr:" \
-	-e "s:OPTI    = -O3 -funroll-loops -fomit-frame-pointer #-mpentium:OPTI    = ${CFLAGS} -funroll-loops -fomit-frame-pointer:" Makefile.orig > Makefile
+	sed -i -e "s:DESTDIR = /usr/local:DESTDIR = /usr:" \
+	-e "s:OPTI    = -O3 -funroll-loops -fomit-frame-pointer #-mpentium:OPTI    = ${CFLAGS} -funroll-loops -fomit-frame-pointer:" Makefile
 }
 
 src_compile() {
diff --git a/app-editors/beaver/beaver-0.2.4.ebuild b/app-editors/beaver/beaver-0.2.4.ebuild
index e2df7c2d5e1e..d73331f40a3f 100644
--- a/app-editors/beaver/beaver-0.2.4.ebuild
+++ b/app-editors/beaver/beaver-0.2.4.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/beaver/beaver-0.2.4.ebuild,v 1.6 2003/02/13 06:38:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/beaver/beaver-0.2.4.ebuild,v 1.7 2003/10/01 11:39:33 aliz Exp $
 
 S=${WORKDIR}/${P}
 
@@ -19,9 +19,8 @@ src_unpack() {
 
 	cd ${S}/src
 
-	cp Makefile Makefile.orig
-	sed -e "s:DESTDIR = /usr/local:DESTDIR = /usr:" \
-	-e "s:OPTI    = -O3 -funroll-loops -fomit-frame-pointer #-mpentium:OPTI    = ${CFLAGS} -funroll-loops -fomit-frame-pointer:" Makefile.orig > Makefile
+	sed -i -e "s:DESTDIR = /usr/local:DESTDIR = /usr:" \
+	-e "s:OPTI    = -O3 -funroll-loops -fomit-frame-pointer #-mpentium:OPTI    = ${CFLAGS} -funroll-loops -fomit-frame-pointer:" Makefile
 }
 
 src_compile() {
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index ad7b6c2d67be..e30146b25a7f 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,7 +1,7 @@
 MD5 14077b009a66219f9df720c4ab7a21c9 ChangeLog 3360
 MD5 745c86a5659c1d44a29523420cb99da4 bluefish-0.7-r3.ebuild 1139
 MD5 5be71a473b05133ddbe7903f1a7a8dbc bluefish-0.8.ebuild 987
-MD5 179e5a0673dd855d3919f6e301429ec9 bluefish-0.9.ebuild 1101
+MD5 f6a325df582b0419f89275fe7df21a99 bluefish-0.9.ebuild 1014
 MD5 57d37af3f7a3050d0231181259411b22 bluefish-0.10.ebuild 1328
 MD5 67b962b2ed24223839e4272d7a4ab875 bluefish-0.11.ebuild 1328
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
diff --git a/app-editors/bluefish/bluefish-0.9.ebuild b/app-editors/bluefish/bluefish-0.9.ebuild
index 035425a7a2b4..26f5a6286df3 100644
--- a/app-editors/bluefish/bluefish-0.9.ebuild
+++ b/app-editors/bluefish/bluefish-0.9.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/bluefish/bluefish-0.9.ebuild,v 1.8 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.9.ebuild,v 1.9 2003/10/01 11:39:33 aliz Exp $
 
 DESCRIPTION="Bluefish is a GTK HTML editor for the experienced web designer or programmer."
 SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${P}.tar.bz2"
@@ -26,13 +26,9 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	sed -e "s:"/usr/share/pixmaps/b":"${D}/usr/share/pixmaps/b":g" Makefile \
-		> Makefile.new
-	cp Makefile.new Makefile
+	sed -i -e "s:"/usr/share/pixmaps/b":"${D}/usr/share/pixmaps/b":g" Makefile
 	cd data
-	sed -e "s:"/usr/share":"${D}/usr/share":g" Makefile \
-		> Makefile.new
-	cp Makefile.new Makefile
+	sed -i -e "s:"/usr/share":"${D}/usr/share":g" Makefile 
 	dodir /usr/bin
 	dodir /usr/share/pixmaps
 	dodir /usr/share/applications
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
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4644fd93bcad..f20c5d0e7b64 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.14 2003/07/31 13:56:42 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.15 2003/10/01 11:39:33 aliz Exp $
 
   31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> emacs-21.3-r1.ebuild:
   stable on alpha
@@ -10,6 +10,8 @@
   01 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-21.3-r1.ebuild:
   resolves bug 18419 -- adds gif support
 
+*emacs-21.3 (27 Mar 2003)
+
 *emacs-21.2-r2 (14 Sep 2002)
 
   06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 35acc3520964..438d0d23b6a4 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,15 +1,15 @@
-MD5 a5d800efc3189f163b0c41a5ab256596 ChangeLog 2159
+MD5 2037bea8edc9ebf7a8875e342f144043 ChangeLog 2184
 MD5 67cf7c0e0c11a91a851438ca6bc338ed emacs-21.1-r4.ebuild 2206
 MD5 704db8d0115b42b3b4361f7d40bebd2f emacs-21.2-r1.ebuild 1836
 MD5 4ae3960b78145e7aa8799fbf5b0dd8af emacs-21.2-r2.ebuild 1895
 MD5 c4ccc1e9d1b36d0e8b28273d667e6175 emacs-21.2.ebuild 1720
-MD5 d84405df14671c1a8707dea86d2f5ca0 emacs-21.3-r1.ebuild 2051
 MD5 34ccf078929416d842ed532f0d5833af emacs-21.3.ebuild 2048
+MD5 d84405df14671c1a8707dea86d2f5ca0 emacs-21.3-r1.ebuild 2051
 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
 MD5 b3712a5ad117f8239ed6df12d6873075 files/digest-emacs-21.2 64
 MD5 b3712a5ad117f8239ed6df12d6873075 files/digest-emacs-21.2-r1 64
 MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3 126
-MD5 c196c1f14bc7e319f1dadb065f39bbfb files/digest-emacs-21.3-r1 323
 MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3 126
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 c196c1f14bc7e319f1dadb065f39bbfb files/digest-emacs-21.3-r1 323
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 9e5bf965e530..b0d2d1dcf0b8 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,6 +1,6 @@
 MD5 ccdaf8f986f79a7b5295fca2d832b4d3 ChangeLog 2871
 MD5 190b0d6febf272d053aa3f325f038a86 fte-20010819-r2.ebuild 1773
-MD5 c9b92bf6f41991ff991d6ba24bf58e15 fte-20010819-r3.ebuild 1672
+MD5 d2cfe6e948482029266710b63f90e72f fte-20010819-r3.ebuild 1599
 MD5 ac89e4d1d1adc19a98109bb9868a66ce fte-20020324.ebuild 1862
 MD5 12cd7e88b52d2c559237f07f3c7cd290 fte-20020324-r1.ebuild 1888
 MD5 14b0444b3c0e9a62373b4a104b2a8707 files/digest-fte-20010819-r2 133
diff --git a/app-editors/fte/fte-20010819-r3.ebuild b/app-editors/fte/fte-20010819-r3.ebuild
index 6686c0f21e19..53104bce6f9f 100644
--- a/app-editors/fte/fte-20010819-r3.ebuild
+++ b/app-editors/fte/fte-20010819-r3.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/fte/fte-20010819-r3.ebuild,v 1.14 2003/09/05 01:56:28 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r3.ebuild,v 1.15 2003/10/01 11:39:33 aliz Exp $
 
 inherit eutils
 
@@ -8,8 +8,8 @@ IUSE="gpm slang X"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Lightweight text-mode editor"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
-	mirror://sourceforge/${PN}/${P}-common.zip"
+SRC_URI="mirror://sourceforge/fte/${P}-src.zip
+	mirror://sourceforge/fte/${P}-common.zip"
 HOMEPAGE="http://fte.sourceforge.net"
 
 RDEPEND=">=sys-libs/ncurses-5.2
@@ -49,11 +49,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
-	cp src/fte-unix.mak src/fte-unix.mak.orig
-
-	sed -e "s:@targets@:${TARGETS}:" \
+	sed -i -e "s:@targets@:${TARGETS}:" \
 		-e "s:@cflags@:${CFLAGS}:" \
-		src/fte-unix.mak.orig > src/fte-unix.mak
+		src/fte-unix.mak
 }
 
 src_compile() {
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 5bdefc64a503..9729fe2ad59a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,15 +1,15 @@
 MD5 87a75d92c3d8108dc8ad961ea6779927 ChangeLog 5511
 MD5 75e55bbb1df235332aa58ab6b0a51e73 gedit-0.9.6-r1.ebuild 957
-MD5 5c901d65fe6684697ae73414926e719d gedit-2.0.5.ebuild 958
+MD5 a3c95d81ea59154431789eac97fa9288 gedit-2.0.5.ebuild 955
+MD5 50b94a3f84d3555b32afbcc86193c277 gedit-2.2.2.ebuild 840
 MD5 425f86f9bec101364042695bf4e43a12 gedit-2.2.0.1.ebuild 876
 MD5 baacd31c2569a2f3fbe7b9096f218800 gedit-2.2.1.ebuild 866
-MD5 848b028363d5423d7cb7d35b38cddc2a gedit-2.4.0.ebuild 946
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 50b94a3f84d3555b32afbcc86193c277 gedit-2.2.2.ebuild 840
+MD5 848b028363d5423d7cb7d35b38cddc2a gedit-2.4.0.ebuild 946
 MD5 b1cd4f5d4adf64b0c6ce68ebe818a495 files/digest-gedit-0.9.6-r1 64
-MD5 7c76f71781ea4481e3df9e0b9c8fb57c files/digest-gedit-2.0.5 65
-MD5 020623e768fdaa1c4c112225652866ae files/digest-gedit-2.2.0.1 67
 MD5 4ad8e5e9b5a2142b9970a020e2855f71 files/digest-gedit-2.2.1 65
+MD5 7c76f71781ea4481e3df9e0b9c8fb57c files/digest-gedit-2.0.5 65
 MD5 df05a340a041c7bdf52232c69b095b1e files/digest-gedit-2.2.2 65
+MD5 020623e768fdaa1c4c112225652866ae files/digest-gedit-2.2.0.1 67
 MD5 f828f39c4a808c2e69a66ee383cb65af files/digest-gedit-2.4.0 65
 MD5 f7c3aa15d4ccd75179194ddd7b8c9fdd files/gedit-2.4.0-fix_LC_ALL.patch 679
diff --git a/app-editors/gedit/gedit-2.0.5.ebuild b/app-editors/gedit/gedit-2.0.5.ebuild
index b2c0a70e4908..71e4d9ad0e0c 100644
--- a/app-editors/gedit/gedit-2.0.5.ebuild
+++ b/app-editors/gedit/gedit-2.0.5.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/gedit/gedit-2.0.5.ebuild,v 1.9 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.0.5.ebuild,v 1.10 2003/10/01 11:39:33 aliz Exp $
 
 inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A text editor for the Gnome2 desktop"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gnome/2.0.1/sources/gedit/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/gnome-chord/Manifest b/app-editors/gnome-chord/Manifest
index d67121d8de33..02907bd710fb 100644
--- a/app-editors/gnome-chord/Manifest
+++ b/app-editors/gnome-chord/Manifest
@@ -1,3 +1,3 @@
-MD5 3d80f15eb63d012082998add410219d3 files/digest-gnome-chord-0.7.0 70
-MD5 60fb14a03d30dba16b633c0942bf3a58 gnome-chord-0.7.0.ebuild 631
 MD5 a8ee94cf56f3b61ef82eed6b5d621a97 ChangeLog 394
+MD5 808a5b56d39c0d7e86665f52bb9f7605 gnome-chord-0.7.0.ebuild 637
+MD5 3d80f15eb63d012082998add410219d3 files/digest-gnome-chord-0.7.0 70
diff --git a/app-editors/gnome-chord/gnome-chord-0.7.0.ebuild b/app-editors/gnome-chord/gnome-chord-0.7.0.ebuild
index 22379e4e8f05..c2c911e45dfa 100644
--- a/app-editors/gnome-chord/gnome-chord-0.7.0.ebuild
+++ b/app-editors/gnome-chord/gnome-chord-0.7.0.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/gnome-chord/gnome-chord-0.7.0.ebuild,v 1.3 2003/06/29 18:24:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gnome-chord/gnome-chord-0.7.0.ebuild,v 1.4 2003/10/01 11:39:33 aliz Exp $
 
 inherit gnome2
 
@@ -8,7 +8,7 @@ S="${WORKDIR}/${PN}2-${PV}"
 
 DESCRIPTION="Chord and scale editor for gnome"
 HOMEPAGE="http://gnome-chord.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}2-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/gnome-chord/${PN}2-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
diff --git a/app-editors/hexedit/ChangeLog b/app-editors/hexedit/ChangeLog
index 797551dd3663..60a69491fb6f 100644
--- a/app-editors/hexedit/ChangeLog
+++ b/app-editors/hexedit/ChangeLog
@@ -1,13 +1,13 @@
 # ChangeLog for app-editors/hexedit
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hexedit/ChangeLog,v 1.6 2003/05/21 12:41:52 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hexedit/ChangeLog,v 1.7 2003/10/01 11:39:33 aliz Exp $
 
   21 May 2003; Tavis Ormandy <taviso@gentoo.org> hexedit-1.2.2.ebuild:
   looks good on alpha.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*hexedit-1.2.2; (14 Feb 2002)
+*hexedit-1.2.2 (14 Feb 2002)
 
   06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
   Added ppc to keywords
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index 45647752b073..0c8b54f095df 100644
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@@ -1,3 +1,3 @@
-MD5 92ffae14710eeb972a86b535b2910d9b ChangeLog 630
+MD5 c7d55d3bf2e85896ba0c3a42b8565b76 ChangeLog 627
 MD5 5b7e185ebb4901f6453d39f929915719 hexedit-1.2.2.ebuild 741
 MD5 6e5875f691ced8ecac86ccc41c443a3b files/digest-hexedit-1.2.2 65
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index f3b4768a0d02..6d7fb9337090 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,10 +1,10 @@
-MD5 df9cd04da33486e61c43497a60044f3b jed-0.99.14-r1.ebuild 1522
-MD5 7de0c5e5ef09be8ec06f0d128d4ac4a6 jed-0.99.16-r1.ebuild 2207
-MD5 43d09588d35bb87846927d2ad8bdb1f9 jed-0.99.16.ebuild 1522
 MD5 4b616baedaeb00b73f444941245f5b72 ChangeLog 1883
+MD5 2788bc393555d89f177afa7fd5f0bf62 jed-0.99.14-r1.ebuild 1515
+MD5 80c06f05ee21c32f252909065c96cd1c jed-0.99.16-r1.ebuild 2059
+MD5 fb0a05ce0fab7071fd87a00d92df00f5 jed-0.99.16.ebuild 1473
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
-MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16 64
-MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
 MD5 51be96423b1d381dae0e2f3adbd6baa9 files/digest-jed-0.99.14-r1 65
+MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16 64
 MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r1 64
+MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
+MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
diff --git a/app-editors/jed/jed-0.99.14-r1.ebuild b/app-editors/jed/jed-0.99.14-r1.ebuild
index f658209d59c1..e06e8c7864ee 100644
--- a/app-editors/jed/jed-0.99.14-r1.ebuild
+++ b/app-editors/jed/jed-0.99.14-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/jed/jed-0.99.14-r1.ebuild,v 1.12 2003/09/18 22:28:57 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.14-r1.ebuild,v 1.13 2003/10/01 11:39:33 aliz Exp $
 
 IUSE="X gpm"
 
@@ -61,7 +61,7 @@ src_install () {
 
 	cd ${S}/info
 	rm info.info
-	patch < ${FILESDIR}/jed.info.diff || die
+	epatch ${FILESDIR}/jed.info.diff
 	cd ${S}
 
 	insinto /usr/share/info
diff --git a/app-editors/jed/jed-0.99.16-r1.ebuild b/app-editors/jed/jed-0.99.16-r1.ebuild
index cb46bc908c2e..1f280d79d32a 100644
--- a/app-editors/jed/jed-0.99.16-r1.ebuild
+++ b/app-editors/jed/jed-0.99.16-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/jed/jed-0.99.16-r1.ebuild,v 1.9 2003/09/18 22:28:57 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.10 2003/10/01 11:39:33 aliz Exp $
 
 IUSE="X gpm truetype"
 
@@ -33,22 +33,19 @@ src_compile() {
 
 	if [ -n "`use gpm`" ] ; then
 		cd src
-		mv Makefile Makefile.orig
-		sed 	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
+		sed -i	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
 			-e 's/#MOUSELIB/MOUSELIB/' \
 			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
 			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
-			Makefile.orig > Makefile
+			Makefile
 		cd ${S}
 	fi
 
 	if [ -n "`use X`" -a -n "`use truetype`" ]; then
 	   cd src
-	   mv Makefile Makefile.orig
-	   sed -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile.orig > Makefile.new
-	   sed -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile.new > Makefile
-	   mv jed-feat.h jed-feat.h.orig
-	   sed -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' jed-feat.h.orig > jed-feat.h
+	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
+	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
+	   sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' jed-feat.h
 	   cd ${S}
 	fi
 
diff --git a/app-editors/jed/jed-0.99.16.ebuild b/app-editors/jed/jed-0.99.16.ebuild
index 60ef60b53b53..33fb68e089ed 100644
--- a/app-editors/jed/jed-0.99.16.ebuild
+++ b/app-editors/jed/jed-0.99.16.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/jed/jed-0.99.16.ebuild,v 1.5 2003/09/18 22:28:57 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16.ebuild,v 1.6 2003/10/01 11:39:33 aliz Exp $
 
 IUSE="X gpm"
 
@@ -30,12 +30,11 @@ src_compile() {
 
 	if [ -n "`use gpm`" ] ; then
 		cd src
-		mv Makefile Makefile.orig
-		sed 	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
+		sed -i 	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
 			-e 's/#MOUSELIB/MOUSELIB/' \
 			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
 			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
-			Makefile.orig > Makefile
+			Makefile
 		cd ${S}
 	fi
 
@@ -60,7 +59,7 @@ src_install () {
 
 	cd ${S}/info
 	rm info.info
-	patch < ${FILESDIR}/jed.info.diff || die
+	epatch${FILESDIR}/jed.info.diff
 	cd ${S}
 
 	insinto /usr/share/info
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 7d9c76467574..6f240634b849 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,5 +1,5 @@
 MD5 f717c09d3bb1d1cc070b968d01b7dd1c ChangeLog 1710
-MD5 ea6bac57bd28c66a0c9b853d6d3ecf0c joe-2.9.5.ebuild 892
+MD5 3a9264850bc7c423c3a10cc2bcf62897 joe-2.9.5.ebuild 848
 MD5 8ab8d8fa2e4cd864d04919d75e9718b2 joe-2.9.8_pre1.ebuild 680
 MD5 5de1eabdcfe2d4389e408164989b0fda joe-2.9.8.ebuild 678
 MD5 2d0cff8feae94e95e4d345c184aedf2e files/digest-joe-2.9.5 58
diff --git a/app-editors/joe/joe-2.9.5.ebuild b/app-editors/joe/joe-2.9.5.ebuild
index efe2936d8460..152e0980ba78 100644
--- a/app-editors/joe/joe-2.9.5.ebuild
+++ b/app-editors/joe/joe-2.9.5.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/joe/joe-2.9.5.ebuild,v 1.12 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-2.9.5.ebuild,v 1.13 2003/10/01 11:39:33 aliz Exp $
 
 IUSE=""
 
@@ -18,8 +18,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2"
 PROVIDE="virtual/editor"
 
 src_compile() {
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 	make joe termidx || die
 }
 
diff --git a/app-editors/quanta/ChangeLog b/app-editors/quanta/ChangeLog
index 7b3fe01fc838..c4847c311ec1 100644
--- a/app-editors/quanta/ChangeLog
+++ b/app-editors/quanta/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-editors/quanta
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/ChangeLog,v 1.16 2003/09/30 08:18:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/ChangeLog,v 1.17 2003/10/01 11:39:33 aliz Exp $
 
 *quanta-3.1.4 (18 Sep 2003)
 
@@ -27,8 +27,11 @@
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*quanta-3.0 (28 Sep 2002) Bart Verwilst <verwilst@gentoo.org>
+*quanta-3.1 (20 Nov 2002)
 
+*quanta-3.0 (28 Sep 2002) 
+
+  28 Sep 2003; Bart Verwilst <verwilst@gentoo.org>
   Quanta 3.0 Final. Have fun!
 
 *quanta-3.0_pre2 (28 Sept 2002) Olivier Reisch <doctomoe@gentoo.org>
diff --git a/app-editors/quanta/Manifest b/app-editors/quanta/Manifest
index 9747649e4d46..cee9a2acdf6b 100644
--- a/app-editors/quanta/Manifest
+++ b/app-editors/quanta/Manifest
@@ -1,4 +1,4 @@
-MD5 ed8b536bd00a7b5c1dff3146a87f2026 ChangeLog 2110
+MD5 bd7507fef0983e9de01f6ade9c09a26f ChangeLog 2153
 MD5 d93bc76ef0d4915f8e4e8f4e8418af98 quanta-2.0.1.ebuild 879
 MD5 6fccd45d419b4089780ea932fc7459da quanta-3.0.ebuild 838
 MD5 9158f69d2fd60510d1e00a7ae2c33675 quanta-3.1.ebuild 897
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index fe9265bb37c0..18eb0a04ee66 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.70 2003/09/18 13:41:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.71 2003/10/01 11:39:33 aliz Exp $
 
 *vim-6.2-r3 (18 Sep 2003)
 
@@ -102,7 +102,7 @@
   eclass now snoops the patches to determine what is relevant instead of using
   the README.  Create vim->gvim and vi->vim symlinks when there's no conflict.
 
-*vim-6.1-r20.ebuild (13 Mar 2003)
+*vim-6.1-r20 (13 Mar 2003)
 
   13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> vim-6.1-r20.ebuild
   files/vimrc vim-6.1-r19.ebuild :
@@ -130,7 +130,7 @@
   22 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> vim-6.1-r19.ebuild :
   Unmasked, security update.
 
-*vim-6.1-r19.ebuild (21 Jan 2003)
+*vim-6.1-r19 (21 Jan 2003)
 
   14 Mar 2003; Jan Seidel <tuxus@gentoo.org> vim-6.1-r19.ebuild :
   Added mips to KEYWORDS
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index bf5b1ebbc48e..557329a7e707 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,31 +1,31 @@
-MD5 f8b2e7afad3babe24b872ab0e6bd844d ChangeLog 12120
-MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 207931daba6df8e786e1d670a779ccd5 vim-6.1-r19.ebuild 746
+MD5 d25884149750287d049f3cf046d79ac3 ChangeLog 12102
 MD5 afa117c01ab0971d1617cd2859de3c50 vim-6.1-r20.ebuild 752
 MD5 77766d8697a1591edafebfdf7328fc3a vim-6.1-r21.ebuild 752
-MD5 dab97fed6dad404ea6304849abaf860f vim-6.2-r1.ebuild 773
-MD5 fc5912330f03be70f7e65e16ae039030 vim-6.2-r2.ebuild 768
-MD5 bc755b0b291a80045cb6cffaa98e872d vim-6.2-r3.ebuild 775
-MD5 9244a0b045b3b65e3e9e427ac15a8b5f vim-6.2.ebuild 765
 MD5 ed8562f1e679bc05ff2d422a118a4c88 vim-6.2_pre1.ebuild 779
+MD5 207931daba6df8e786e1d670a779ccd5 vim-6.1-r19.ebuild 746
 MD5 51eec84cd4dc7063ef2b4e3931330d78 vim-6.2_pre2.ebuild 770
 MD5 e3a7899ca2936e24644180623aff0872 vim-6.2_pre3.ebuild 770
 MD5 8b92a1508afba91574c8f1d166ad8f39 vim-6.2_pre4.ebuild 770
 MD5 afb3d72a1c4b0e94003a4f157f01b656 vim-6.2_pre5.ebuild 770
 MD5 86d14f44ccc6b66b37c5a6480ee13f4d vim-6.2_pre6-r1.ebuild 796
 MD5 73c829d038af5847578f8346d98d3252 vim-6.2_pre6.ebuild 787
-MD5 1d11d58beb06eea4047df9e2aac21b19 files/digest-vim-6.1-r19 276
+MD5 9244a0b045b3b65e3e9e427ac15a8b5f vim-6.2.ebuild 765
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 dab97fed6dad404ea6304849abaf860f vim-6.2-r1.ebuild 773
+MD5 fc5912330f03be70f7e65e16ae039030 vim-6.2-r2.ebuild 768
+MD5 bc755b0b291a80045cb6cffaa98e872d vim-6.2-r3.ebuild 775
 MD5 c96b34e1faa671e615625005a24025d0 files/digest-vim-6.1-r20 276
 MD5 b7dc3cd96fb37f8c8a5afb11cd6b6af2 files/digest-vim-6.1-r21 280
-MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-vim-6.2 274
-MD5 38a359b4a00f99fcecd10986eb83a691 files/digest-vim-6.2-r1 274
-MD5 581974f7e2a2c4054b563db39720cc32 files/digest-vim-6.2-r2 274
-MD5 7872d6ce1d0728653a5d0ebd09d069ae files/digest-vim-6.2-r3 275
 MD5 c1c3576985bcab3a31e4abd27ee00d07 files/digest-vim-6.2_pre1 201
 MD5 bd60e74d8b97496b46e4c67d6f3f250c files/digest-vim-6.2_pre2 202
+MD5 1d11d58beb06eea4047df9e2aac21b19 files/digest-vim-6.1-r19 276
 MD5 6308e9c63def2292a39768b027e7dd8d files/digest-vim-6.2_pre3 202
 MD5 6728ef59d894bb20a2e73e0c8dbadee0 files/digest-vim-6.2_pre4 202
+MD5 48e706214652b216c21280e50511627d files/vimrc 3004
 MD5 9c45da60df8647f8a864b3c8771d4147 files/digest-vim-6.2_pre5 202
 MD5 d801c92905910233969436d07d62e092 files/digest-vim-6.2_pre6 202
 MD5 61433f14f33c16dd168c32f32c2152d4 files/digest-vim-6.2_pre6-r1 202
-MD5 48e706214652b216c21280e50511627d files/vimrc 3004
+MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-vim-6.2 274
+MD5 38a359b4a00f99fcecd10986eb83a691 files/digest-vim-6.2-r1 274
+MD5 581974f7e2a2c4054b563db39720cc32 files/digest-vim-6.2-r2 274
+MD5 7872d6ce1d0728653a5d0ebd09d069ae files/digest-vim-6.2-r3 275