various epatch and sed fixes

7 files changed, 25 insertions, 25 deletions

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