various epatch and sed fixes

21 files changed, 58 insertions, 62 deletions

diff --git a/app-editors/kxmleditor/Manifest b/app-editors/kxmleditor/Manifest
index 7eba75903840..ca4feced31a5 100644
--- a/app-editors/kxmleditor/Manifest
+++ b/app-editors/kxmleditor/Manifest
@@ -1,6 +1,6 @@
 MD5 c7a970ae4f627e9593123669843cfe85 ChangeLog 811
-MD5 5f489955b0743d511aa8661987af11dc kxmleditor-0.8.1.ebuild 430
-MD5 32279d24a96f12408c61de2952cc84ef kxmleditor-0.8.ebuild 595
+MD5 62be3d49ddb9ac2c39e65e66daf13997 kxmleditor-0.8.ebuild 596
+MD5 a9a60d0c8412cbf6d0879c5ceff09934 kxmleditor-0.8.1.ebuild 431
 MD5 6f65721e85241e0aaedd74470657c12d files/digest-kxmleditor-0.8 66
-MD5 2c44cde00203160f021f8f2645e8cfb7 files/digest-kxmleditor-0.8.1 69
 MD5 848bbac8ddef072cb80cb5707f5fbf15 files/kxmleditor-0.8-gcc3.diff 532
+MD5 2c44cde00203160f021f8f2645e8cfb7 files/digest-kxmleditor-0.8.1 69
diff --git a/app-editors/kxmleditor/kxmleditor-0.8.1.ebuild b/app-editors/kxmleditor/kxmleditor-0.8.1.ebuild
index 55d5b9f47e21..d3dd8ba0d2fd 100644
--- a/app-editors/kxmleditor/kxmleditor-0.8.1.ebuild
+++ b/app-editors/kxmleditor/kxmleditor-0.8.1.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/kxmleditor/kxmleditor-0.8.1.ebuild,v 1.2 2003/04/05 21:36:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kxmleditor/kxmleditor-0.8.1.ebuild,v 1.3 2003/10/24 12:55:26 aliz Exp $
 inherit kde-base
 
 need-kde 3
 IUSE=""
 DESCRIPTION="KDE XML Editor"
 HOMEPAGE="http://kxmleditor.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/kxmleditor/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="x86"
diff --git a/app-editors/kxmleditor/kxmleditor-0.8.ebuild b/app-editors/kxmleditor/kxmleditor-0.8.ebuild
index 7cfc544e9d3c..f1e7a719f4f0 100644
--- a/app-editors/kxmleditor/kxmleditor-0.8.ebuild
+++ b/app-editors/kxmleditor/kxmleditor-0.8.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/kxmleditor/kxmleditor-0.8.ebuild,v 1.5 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kxmleditor/kxmleditor-0.8.ebuild,v 1.6 2003/10/24 12:55:26 aliz Exp $
 inherit kde-base
 
 need-kde 3
 DESCRIPTION="KDE XML Editor"
 HOMEPAGE="http://kxmleditor.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/kxmleditor/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
index 09f8962f47a1..3a097239f5b2 100644
--- a/app-editors/levee/Manifest
+++ b/app-editors/levee/Manifest
@@ -1,3 +1,3 @@
 MD5 d555c51b805307d8a213b06aebeb9d48 ChangeLog 742
-MD5 3f41e826758fa09dfba3873a1e28e2b2 levee-3.4o.ebuild 707
+MD5 68c5978ba4f999f2493a2d9136155919 levee-3.4o.ebuild 664
 MD5 3be49a04d398eccd04b4394005806b69 files/digest-levee-3.4o 56
diff --git a/app-editors/levee/levee-3.4o.ebuild b/app-editors/levee/levee-3.4o.ebuild
index 668c3ab1a1f2..b5271dc6d4bd 100644
--- a/app-editors/levee/levee-3.4o.ebuild
+++ b/app-editors/levee/levee-3.4o.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/levee/levee-3.4o.ebuild,v 1.12 2003/02/10 11:09:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/levee/levee-3.4o.ebuild,v 1.13 2003/10/24 12:55:26 aliz Exp $
 
 IUSE=""
 
@@ -16,8 +16,7 @@ KEYWORDS="x86 ppc sparc"
 DEPEND="sys-libs/ncurses"
 
 src_compile() {
-	sed -e "/^CFLAGS/ s:-O:${CFLAGS}:" < Makefile > Makefile.out
-	mv Makefile.out Makefile
+	sed -i -e "/^CFLAGS/ s:-O:${CFLAGS}:" Makefile
 	make LIBES=-lncurses || die
 }
 
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 6ec0ca125dfb..aa54f740943f 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,8 +1,8 @@
-MD5 7cb28b4d27a70d76d58260843e203ac8 nedit-5.3-r2.ebuild 1101
-MD5 5f0f061abbba5917a7aab49e13cd693d nedit-5.4_pre20030213.ebuild 1106
 MD5 1e8c40cccabe3cbc75c13ce329a811be ChangeLog 2952
-MD5 0f098d72415c6f622098ab926a5acfe1 nedit-5.3-r1.ebuild 1009
+MD5 96a1ddfa36650b575ddf6d77dff0a130 nedit-5.3-r1.ebuild 961
+MD5 15efadb3b3b700aab8b0f2bab615f9eb nedit-5.3-r2.ebuild 1041
+MD5 09f81d42b48adb5d082582cf8ab420cc nedit-5.4_pre20030213.ebuild 1045
 MD5 d67d5d17a4951126595fe2eb36897f15 files/digest-nedit-5.3-r1 68
 MD5 d67d5d17a4951126595fe2eb36897f15 files/digest-nedit-5.3-r2 68
-MD5 f1de401822d203ac95aa0366234fb63a files/nedit-5.3-gentoo.diff 2629
 MD5 670415ebfa4cdbe202a201f5fabba73c files/digest-nedit-5.4_pre20030213 74
+MD5 f1de401822d203ac95aa0366234fb63a files/nedit-5.3-gentoo.diff 2629
diff --git a/app-editors/nedit/nedit-5.3-r1.ebuild b/app-editors/nedit/nedit-5.3-r1.ebuild
index 311b131b96d8..545d2e2e9e0b 100644
--- a/app-editors/nedit/nedit-5.3-r1.ebuild
+++ b/app-editors/nedit/nedit-5.3-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/nedit/nedit-5.3-r1.ebuild,v 1.7 2003/10/21 23:32:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3-r1.ebuild,v 1.8 2003/10/24 12:55:26 aliz Exp $
 
 MY_PV=${PV/./_}
 DESCRIPTION="multi-purpose Motif-based text editor for the X Window System"
@@ -18,9 +18,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}/makefiles
-	cp Makefile.linux Makefile.orig
-	sed -e "s:-O:${CFLAGS}:" -e "s/-lm/-lm -lXmu/" \
-	Makefile.orig > Makefile.linux || die
+	sed -i -e "s:-O:${CFLAGS}:" -e "s/-lm/-lm -lXmu/" \
+	 Makefile.linux || die
 }
 
 src_compile() {
diff --git a/app-editors/nedit/nedit-5.3-r2.ebuild b/app-editors/nedit/nedit-5.3-r2.ebuild
index 4c98a2df76fc..9732836c29b6 100644
--- a/app-editors/nedit/nedit-5.3-r2.ebuild
+++ b/app-editors/nedit/nedit-5.3-r2.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/nedit/nedit-5.3-r2.ebuild,v 1.9 2003/10/21 23:32:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3-r2.ebuild,v 1.10 2003/10/24 12:55:26 aliz Exp $
 
 inherit eutils
 
@@ -24,9 +24,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
-	cp ${S}/makefiles/Makefile.linux ${T}
-	sed "s:-O:${CFLAGS} -D__LINUX__:" \
-		${T}/Makefile.linux > ${S}/makefiles/Makefile.linux
+	sed -i "s:-O:${CFLAGS} -D__LINUX__:" \
+	 ${S}/makefiles/Makefile.linux
 }
 
 src_compile() {
diff --git a/app-editors/nedit/nedit-5.4_pre20030213.ebuild b/app-editors/nedit/nedit-5.4_pre20030213.ebuild
index 41dfc89be104..bceffa034e25 100644
--- a/app-editors/nedit/nedit-5.4_pre20030213.ebuild
+++ b/app-editors/nedit/nedit-5.4_pre20030213.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/nedit/nedit-5.4_pre20030213.ebuild,v 1.6 2003/10/21 23:32:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.4_pre20030213.ebuild,v 1.7 2003/10/24 12:55:26 aliz Exp $
 
 inherit eutils
 
@@ -24,9 +24,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/nedit-5.3-gentoo.diff
 
-	cp ${S}/makefiles/Makefile.linux ${T}
-	sed "s:-O:${CFLAGS} -D__LINUX__:" \
-		${T}/Makefile.linux > ${S}/makefiles/Makefile.linux
+	sed -i "s:-O:${CFLAGS} -D__LINUX__:" \
+		${S}/makefiles/Makefile.linux
 }
 
 src_compile() {
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index e76fe9d9ef90..743724d972c6 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -1,4 +1,4 @@
+MD5 5d8c6d098df1d6371b2c922acbd9eb79 ChangeLog 494
+MD5 f247e5bcfdd872154c574b25f517b5ae qemacs-0.3.1.ebuild 998
 MD5 1bef560680eaab10f0524f228c5dc6eb files/digest-qemacs-0.3.1 64
 MD5 a4c613ab493b62325669d8d1353c8b2e files/qemacs-Makefile-gentoo.patch 421
-MD5 5d8c6d098df1d6371b2c922acbd9eb79 ChangeLog 494
-MD5 45715fb07639eb9aa3e6f3146228e5e2 qemacs-0.3.1.ebuild 1009
diff --git a/app-editors/qemacs/qemacs-0.3.1.ebuild b/app-editors/qemacs/qemacs-0.3.1.ebuild
index 473733797421..51827062a210 100644
--- a/app-editors/qemacs/qemacs-0.3.1.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.1.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/qemacs/qemacs-0.3.1.ebuild,v 1.2 2003/06/29 18:24:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1.ebuild,v 1.3 2003/10/24 12:55:26 aliz Exp $
 
 DESCRIPTION="QEmacs (for Quick Emacs) is a very small but powerful UNIX editor."
 HOMEPAGE="http://fabrice.bellard.free.fr/qemacs/"
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} && patch -p1 <${FILESDIR}/qemacs-Makefile-gentoo.patch || die
+	cd ${S} && epatch ${FILESDIR}/qemacs-Makefile-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-editors/xemacs-gtk/Manifest b/app-editors/xemacs-gtk/Manifest
index cb466d541726..f48791191d6f 100644
--- a/app-editors/xemacs-gtk/Manifest
+++ b/app-editors/xemacs-gtk/Manifest
@@ -1,6 +1,6 @@
 MD5 140c15abc68387ba1194d4606bc5cb0c ChangeLog 1756
-MD5 9607a0a68f8e8844bc837393cca14f3c xemacs-gtk-21.4.8-r2.ebuild 3603
-MD5 2c4eee94094f9f038a7994dc63ba8965 xemacs-gtk-21.4.8-r3.ebuild 3595
+MD5 039c41f70e52db8e4d1b483c9a9b820c xemacs-gtk-21.4.8-r2.ebuild 3595
+MD5 ce9066a103551f4dad59d72ec2c872cc xemacs-gtk-21.4.8-r3.ebuild 3587
 MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
 MD5 1aded704f3bee894201ed229a1438948 files/digest-xemacs-gtk-21.4.8-r2 273
 MD5 cc9ed40a631878d1c97fda74557f5a0a files/digest-xemacs-gtk-21.4.8-r3 273
diff --git a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild
index 3266346721c8..a1306e4c8f5f 100644
--- a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild
+++ b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.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/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild,v 1.11 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild,v 1.12 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm postgres xface tiff gtk jpeg mule nas esd X png gnome"
 
@@ -61,7 +61,7 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${REAL_P}.tar.gz
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild
index 1d3243c7c2d8..295df14c0836 100644
--- a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild
+++ b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-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/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild,v 1.13 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild,v 1.14 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm postgres xface tiff gtk jpeg mule nas esd X png gnome"
 
@@ -60,7 +60,7 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${REAL_P}.tar.gz
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 4ab255ebfa48..69331478949d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,10 +1,10 @@
 MD5 5c24d8160adca0c73988afe4b430a157 ChangeLog 7094
-MD5 af724b1d0888bf60116bb8f0c6539ee4 xemacs-21.4.10-r1.ebuild 4926
-MD5 8d0972a7d312a7d5dd938507d86ea03c xemacs-21.4.10-r2.ebuild 4836
-MD5 97cf46a6171bec6a48e3cc888ab62be1 xemacs-21.4.10.ebuild 3959
-MD5 9c3a7d1a3a0f40f21a36e6f87205b287 xemacs-21.4.11.ebuild 4819
-MD5 85ea98ce19c368c1ce5b868ad52137cf xemacs-21.4.12.ebuild 5064
-MD5 026efd40dc73a39977fa4b1d40855b00 xemacs-21.4.9.ebuild 4257
+MD5 4460c76b1635fa0b8d799b39814596e8 xemacs-21.4.10-r1.ebuild 4904
+MD5 4ab9c1c4b388f0432896f8ac48ca8d88 xemacs-21.4.10-r2.ebuild 4814
+MD5 2bc25a2d545170e5a8640089925c30ae xemacs-21.4.10.ebuild 3932
+MD5 4131a21cb3a5579a7258125d07839fc5 xemacs-21.4.11.ebuild 4792
+MD5 9f18ecc687ca1812e9eb6eaf0892b9c0 xemacs-21.4.12.ebuild 5045
+MD5 12d02a3b58a54f4c725087eed651e879 xemacs-21.4.9.ebuild 4232
 MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
 MD5 c0105f25a98b5dde2f43d624e3e24ca8 files/digest-xemacs-21.4.10 274
 MD5 9d39ec32a092541d819789bc9ec482c8 files/digest-xemacs-21.4.10-r1 274
diff --git a/app-editors/xemacs/xemacs-21.4.10-r1.ebuild b/app-editors/xemacs/xemacs-21.4.10-r1.ebuild
index e2b145a17b93..b06c47c348e1 100644
--- a/app-editors/xemacs/xemacs-21.4.10-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.10-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/xemacs/xemacs-21.4.10-r1.ebuild,v 1.6 2003/07/08 19:13:27 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10-r1.ebuild,v 1.7 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif canna freewnn lucid athena neXt Xaw3d"
 
@@ -68,10 +68,10 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 
 	if [ ${ARCH} = "ppc" ] ; then
-		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+		epatch ${FILESDIR}/${P}-ppc.diff
 	fi
 
 }
diff --git a/app-editors/xemacs/xemacs-21.4.10-r2.ebuild b/app-editors/xemacs/xemacs-21.4.10-r2.ebuild
index 0c65bb230cab..ead8d21fcc0d 100644
--- a/app-editors/xemacs/xemacs-21.4.10-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.10-r2.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/xemacs/xemacs-21.4.10-r2.ebuild,v 1.6 2003/07/08 19:13:27 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10-r2.ebuild,v 1.7 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm postgres xface nas dnd X jpeg tiff png mule motif canna freewnn lucid athena neXt Xaw3d"
 
@@ -65,10 +65,10 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 
 	if [ ${ARCH} = "ppc" ] ; then
-		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+		epatch ${FILESDIR}/${P}-ppc.diff
 	fi
 
 }
diff --git a/app-editors/xemacs/xemacs-21.4.10.ebuild b/app-editors/xemacs/xemacs-21.4.10.ebuild
index 90c6723422c3..f7f09fe6ad26 100644
--- a/app-editors/xemacs/xemacs-21.4.10.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.10.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/xemacs/xemacs-21.4.10.ebuild,v 1.8 2003/09/05 01:59:15 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.10.ebuild,v 1.9 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm esd postgres xface nas X jpeg tiff png mule motif canna"
 
@@ -59,10 +59,10 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 
 	if [ ${ARCH} = "ppc" ] ; then
-		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+		epatch ${FILESDIR}/${P}-ppc.diff
 	fi
 
 }
diff --git a/app-editors/xemacs/xemacs-21.4.11.ebuild b/app-editors/xemacs/xemacs-21.4.11.ebuild
index f299a4d4c9a4..188e91c47b9e 100644
--- a/app-editors/xemacs/xemacs-21.4.11.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.11.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/xemacs/xemacs-21.4.11.ebuild,v 1.5 2003/09/05 01:59:15 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.11.ebuild,v 1.6 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna lucid athena neXt Xaw3d"
 
@@ -69,10 +69,10 @@ src_unpack() {
 	unpack ${PN}-${MY_PV}.tar.gz
 
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 
 	if [ ${ARCH} = "ppc" ] ; then
-		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+		epatch ${FILESDIR}/${P}-ppc.diff
 	fi
 
 }
diff --git a/app-editors/xemacs/xemacs-21.4.12.ebuild b/app-editors/xemacs/xemacs-21.4.12.ebuild
index 65656035a2e1..6377485d323e 100644
--- a/app-editors/xemacs/xemacs-21.4.12.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.12.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/xemacs/xemacs-21.4.12.ebuild,v 1.9 2003/09/05 01:59:15 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.12.ebuild,v 1.10 2003/10/24 12:55:26 aliz Exp $
 
 inherit eutils
 
@@ -66,10 +66,10 @@ src_unpack() {
 	unpack NeXT_XEmacs.tar.gz
 
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch
 
 	if [ ${ARCH} = "ppc" ] ; then
-		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+		epatch ${FILESDIR}/${P}-ppc.diff || die
 	fi
 	epatch ${FILESDIR}/quick-fix.patch
 	# copy Next_XEmacs icons into toolbar dir
diff --git a/app-editors/xemacs/xemacs-21.4.9.ebuild b/app-editors/xemacs/xemacs-21.4.9.ebuild
index 70350fd7c8f5..e2d7a227e5f5 100644
--- a/app-editors/xemacs/xemacs-21.4.9.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.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/xemacs/xemacs-21.4.9.ebuild,v 1.10 2003/09/05 01:59:15 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.9.ebuild,v 1.11 2003/10/24 12:55:26 aliz Exp $
 
 IUSE="gpm esd postgres xface nas X jpeg tiff png mule"
 
@@ -57,10 +57,10 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	patch -p0 <${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
+	epatch ${FILESDIR}/emodules.info-21.4.8-gentoo.patch || die
 
 	if [ ${ARCH} = "ppc" ] ; then
-		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
+		epatch ${FILESDIR}/${P}-ppc.diff || die
 
 		# xemacs broke with glibc-2.3.x. this code checks that condition
 		# and patches xemacs appropriately.
@@ -69,7 +69,7 @@ src_unpack() {
 		if (( $glibc_version >= "31" ))
 		then
 			einfo "PPC runtime fix for glibc >= 2.3.1 (Gentoo bug #14458)"
-			patch -p0 < ${FILESDIR}/${P}-ppc-glibc-2.3.x.diff || die
+			epatch ${FILESDIR}/${P}-ppc-glibc-2.3.x.diff
 		fi
 	fi