epatch, sed and changelog fixes

4 files changed, 18 insertions, 22 deletions

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