Add patch from kevquinn for bug #165982.

Package-Manager: portage-2.1.2.5

4 files changed, 34 insertions, 13 deletions

diff --git a/app-shells/ksh/ChangeLog b/app-shells/ksh/ChangeLog
index 91a7c1265e55..7927ae1fdb78 100644
--- a/app-shells/ksh/ChangeLog
+++ b/app-shells/ksh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/ksh
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.28 2007/02/21 23:10:32 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.29 2007/04/29 02:12:29 dirtyepic Exp $
+
+  29 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/ksh-20060214-ed.patch, ksh-93.20060214-r1.ebuild:
+  Add patch from kevquinn for bug #165982.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index c191b496763f..4c739c517cdb 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -6,6 +6,10 @@ AUX ksh-20060124-syntax.patch 3253 RMD160 94448c2254398527656619a9a038869e5ea37d
 MD5 702993754e62bc03f02ba3a4aa5bf05b files/ksh-20060124-syntax.patch 3253
 RMD160 94448c2254398527656619a9a038869e5ea37d60 files/ksh-20060124-syntax.patch 3253
 SHA256 bd938dc795fdff79766736f4d56ca9387f1dba5f20ce39234e6df37f52f3bc45 files/ksh-20060124-syntax.patch 3253
+AUX ksh-20060214-ed.patch 424 RMD160 63114dcd13d42018c63257ad3679d84139887c9c SHA1 0caf4fb7a719603b53aaf2f3eada1971c17af02b SHA256 471d252e309530b51f9df538b5979003df3ae9e8183d975053af14287715901d
+MD5 590617156749c0bcd3e803db98e3d7b5 files/ksh-20060214-ed.patch 424
+RMD160 63114dcd13d42018c63257ad3679d84139887c9c files/ksh-20060214-ed.patch 424
+SHA256 471d252e309530b51f9df538b5979003df3ae9e8183d975053af14287715901d files/ksh-20060214-ed.patch 424
 AUX ksh-93.20030724-libs.diff 12867 RMD160 acf9b6da5e793ede841545f07cdd05b077a2f097 SHA1 de57310b9f6aa2f50dbf2fc4fbd2331e2dd47acc SHA256 06249e684247caf85672347fd94bb463466d0a195056e0fd72c8eb9bdfda824b
 MD5 fc05a830ab720e8d3462bb10f0474258 files/ksh-93.20030724-libs.diff 12867
 RMD160 acf9b6da5e793ede841545f07cdd05b077a2f097 files/ksh-93.20030724-libs.diff 12867
@@ -37,18 +41,18 @@ EBUILD ksh-93.20050202.ebuild 2029 RMD160 f6d22d3e0cee8a02bdc72ef57080a7049c9d91
 MD5 f6a024aa66cf1e16ca5e162bcc1f8a72 ksh-93.20050202.ebuild 2029
 RMD160 f6d22d3e0cee8a02bdc72ef57080a7049c9d910e ksh-93.20050202.ebuild 2029
 SHA256 1c75d550ae1fc1e6593292b2f27be5a4ec34e76c4cdd32b4822507b29b5a8155 ksh-93.20050202.ebuild 2029
-EBUILD ksh-93.20060214-r1.ebuild 1804 RMD160 dd7d6535bfa42fdfe32cbf4711e227fac138ee17 SHA1 4bcfcd07a5b4d15bbfa61c17f400de93097e33f6 SHA256 61b70d1691b47a6a3a3690f88bf6ef0a23de55ad7ef3f7cbcfb415abbbfcb4bc
-MD5 8cc834bb0872c9fef7db7ba4f8769b79 ksh-93.20060214-r1.ebuild 1804
-RMD160 dd7d6535bfa42fdfe32cbf4711e227fac138ee17 ksh-93.20060214-r1.ebuild 1804
-SHA256 61b70d1691b47a6a3a3690f88bf6ef0a23de55ad7ef3f7cbcfb415abbbfcb4bc ksh-93.20060214-r1.ebuild 1804
+EBUILD ksh-93.20060214-r1.ebuild 1854 RMD160 566a8517136553fe367b63cdf52592cd973791ce SHA1 cd0be439ab97e110f1d58be3e160209e840cf69c SHA256 87986b786ce0413f16980c4a728e4f07b8e13b041a35de94a522e10296f8ac7b
+MD5 a09e46797e5ca33fe2436900a6712a68 ksh-93.20060214-r1.ebuild 1854
+RMD160 566a8517136553fe367b63cdf52592cd973791ce ksh-93.20060214-r1.ebuild 1854
+SHA256 87986b786ce0413f16980c4a728e4f07b8e13b041a35de94a522e10296f8ac7b ksh-93.20060214-r1.ebuild 1854
 EBUILD ksh-93.20060214.ebuild 1765 RMD160 e065e9a77548c239d98e8a3f01fe55c796970cb6 SHA1 f6cd5b48517a3a65bec4397e6c6e411772b3c72a SHA256 2b0cce806765fdb44ef923f38953beac73cb1426da51bd2f7085235800124f52
 MD5 cefab0ede56cd4c2b9aef8ef4da88ed6 ksh-93.20060214.ebuild 1765
 RMD160 e065e9a77548c239d98e8a3f01fe55c796970cb6 ksh-93.20060214.ebuild 1765
 SHA256 2b0cce806765fdb44ef923f38953beac73cb1426da51bd2f7085235800124f52 ksh-93.20060214.ebuild 1765
-MISC ChangeLog 3416 RMD160 1433cca73b2a3ef66938743d6404f85ff67c3df2 SHA1 dac008b726bb8eedc479c07b577f640ee6b670ff SHA256 8f6da6f1bdb9656898da1713979523e67b9b72fe469866501928d6141d99099a
-MD5 ce242da4f03f9e2611b060b121734c2c ChangeLog 3416
-RMD160 1433cca73b2a3ef66938743d6404f85ff67c3df2 ChangeLog 3416
-SHA256 8f6da6f1bdb9656898da1713979523e67b9b72fe469866501928d6141d99099a ChangeLog 3416
+MISC ChangeLog 3571 RMD160 f685e4b62f4df2bd392adf6017406382cb48780b SHA1 c4005acacd7343266719bff70822cd0aeb6a7baf SHA256 c3cf09e6c55d8ee9aae61f02fe4524ce2576b9633c95ff90f9989fbe0b82344d
+MD5 9f4ecd02d4b03fb95432a6b0959566c4 ChangeLog 3571
+RMD160 f685e4b62f4df2bd392adf6017406382cb48780b ChangeLog 3571
+SHA256 c3cf09e6c55d8ee9aae61f02fe4524ce2576b9633c95ff90f9989fbe0b82344d ChangeLog 3571
 MISC metadata.xml 1272 RMD160 44e37f599ec2d8e711f244f76559c6e10c6b49d0 SHA1 0a76b17c05d6e4b2676fab810d526c53840d9deb SHA256 ae0640c3d57fe57564524f7ec3275084840d8ee152b65b777e6a5fef7c842642
 MD5 e283b9362f2885bedf238e7c08f51e26 metadata.xml 1272
 RMD160 44e37f599ec2d8e711f244f76559c6e10c6b49d0 metadata.xml 1272
diff --git a/app-shells/ksh/files/ksh-20060214-ed.patch b/app-shells/ksh/files/ksh-20060214-ed.patch
new file mode 100644
index 000000000000..663efead60c2
--- /dev/null
+++ b/app-shells/ksh/files/ksh-20060214-ed.patch
@@ -0,0 +1,12 @@
+diff -Naur work-orig/src/cmd/INIT/mamprobe.sh work/src/cmd/INIT/mamprobe.sh
+--- work-orig/src/cmd/INIT/mamprobe.sh	2007-04-28 19:58:12.000000000 -0600
++++ work/src/cmd/INIT/mamprobe.sh	2007-04-28 19:59:18.000000000 -0600
+@@ -219,7 +219,7 @@
+ 
+ # STD* are standard commands/flags with possible execrate(1)
+ 
+-if	( ed ) < /dev/null > /dev/null 2>&1
++if	( ed -V ) < /dev/null > /dev/null 2>&1
+ then	STDED=ed
+ else	STDED=ex
+ fi
diff --git a/app-shells/ksh/ksh-93.20060214-r1.ebuild b/app-shells/ksh/ksh-93.20060214-r1.ebuild
index 62c88b931416..38cf2861ddd9 100644
--- a/app-shells/ksh/ksh-93.20060214-r1.ebuild
+++ b/app-shells/ksh/ksh-93.20060214-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ksh-93.20060214-r1.ebuild,v 1.3 2006/10/13 05:43:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ksh-93.20060214-r1.ebuild,v 1.4 2007/04/29 02:12:29 dirtyepic Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -37,8 +37,9 @@ src_unpack() {
 	# `package read` will unpack any tarballs put in place.
 	${S}/bin/package read || die
 
-	epatch ${FILESDIR}/ksh-20050202-uname.patch
-	epatch ${FILESDIR}/ksh-20060124-syntax.patch
+	epatch "${FILESDIR}"/ksh-20050202-uname.patch
+	epatch "${FILESDIR}"/ksh-20060124-syntax.patch
+	epatch "${FILESDIR}"/ksh-20060214-ed.patch
 }
 
 src_compile() {