Fix prefix patch, bug 418693.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 21 insertions, 18 deletions

diff --git a/app-shells/ksh/ChangeLog b/app-shells/ksh/ChangeLog
index eecaaa351216..c72fcdc7c969 100644
--- a/app-shells/ksh/ChangeLog
+++ b/app-shells/ksh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/ksh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.56 2012/06/01 16:26:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.57 2012/06/01 22:32:59 floppym Exp $
+
+  01 Jun 2012; Mike Gilbert <floppym@gentoo.org> files/ksh-prefix.patch,
+  ksh-93.20120229.ebuild:
+  Fix prefix patch, bug 418693.
 
   01 Jun 2012; Mike Gilbert <floppym@gentoo.org> ksh-93.20120229.ebuild:
   Drop prefix patch; fails to apply. Bug 418693.
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 4f2e9028ce7f..104d279b63df 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ksh-prefix.patch 1858 RMD160 6af07773b5fb9901f60f496bb25c35bac9f9598f SHA1 b38808607c7b7612f9dec1c963518775431c5107 SHA256 d2bc1935471fdaa609dbf3734cab0fcd0d8d5f597d78c7e2149a19c8b85c4b1a
+AUX ksh-prefix.patch 1780 RMD160 2bb5a928d4eb87d3e624c347ee889487a6f27ced SHA1 526e9ac6c5f48e91c3152157e7edce04ddddbd28 SHA256 9dd102cbd377e403ac01fb138d5a98ce7f9f352c9ce0a1fc38f57ebba8a6e8c3
 DIST INIT.2012-01-01.tgz 376375 RMD160 644157421755d0ce2a293b1837986ea6675b8084 SHA1 ef6326938765571b5a01e96bedb35fee3bc55172 SHA256 60d9a57885f2f37affb6ddab6090275d715236058561f333f351566bedcc2cd1
 DIST INIT.2012-02-29.tgz 379873 RMD160 283a527661df8d58a948890866990fb083607e1c SHA1 e48f7aa9231f1e5519ee46e8708be8241467d354 SHA256 da4a886d28f75f8a011d522697272cd196cdcfb406f92d47f8b0a6608d786896
 DIST ast-base.2011-02-08.tgz 6111018 RMD160 3f5d3acc9e02ac0804d789dcd79c34e939d0f2e0 SHA1 1c9af1389a54d5c94e63f26aad9578f584ab573b SHA256 44ae3913e6c0c8992c6c3cba16864fd4c4a18c6da8e7d87c85a23060cea7cd1a
 DIST ast-base.2012-02-29.tgz 9068922 RMD160 04cc36e074be96fe19efe149b4069e7ec9c93e5a SHA1 82c6a3eb51bf3096968b63b00ccef2f1346e558f SHA256 08223dc93da5a8e3d1b46d772be16cdcfc11b6e41c00b696e8fcf7160b48541b
 EBUILD ksh-93.20110208.ebuild 1273 RMD160 30c526d001e30ac5c1673c8d45acad17d7860baa SHA1 7fdbd324c080d8cae1b41340cb594592851e5bd2 SHA256 b5e73e6c5bdbcf2b83c99e063b83ef8a19ab54f45b7c90d4aaec77c631a70dc6
-EBUILD ksh-93.20120229.ebuild 1471 RMD160 15dc91d593e28093f20d622fc2e7d4f5ae56f19c SHA1 9ff42c712b5538a48d2b33c1b3e0ab65dfe024c7 SHA256 2c57d6f805811368c04ae1fb9006905b9d187b381224d605f86db9b6ecfb1551
-MISC ChangeLog 7514 RMD160 84ec58492b4ca022450d11b819b908fcdbf6ac95 SHA1 be06a12310c4f402518710c22a2aadb5eb5706f3 SHA256 36a92af57bcd66d4a5033061d752d06c23d63c3da696afac2ed6338aaf8d9132
+EBUILD ksh-93.20120229.ebuild 1469 RMD160 7f45309e8fa2f090e79962f91fa2c65825e478e1 SHA1 978421e38ffccb5e82130345e517de52b21356dd SHA256 e55a79d2899c9e5cdebcfefb41958542a8fedd4c229cbe09658958f4490309c4
+MISC ChangeLog 7646 RMD160 7f00b9d7a29fb5f41ad81ebe25866f9712e6707e SHA1 a342d574db7ecb06dfb06bc252db131cf1ebd9b1 SHA256 92c5ab6b793ad46c1b36f850a9152e5f4a6c8e31d672791159cc12cfbffe13d8
 MISC metadata.xml 1375 RMD160 4fb592833be50e59fe290afcce3ccebfe8948dab SHA1 77d9a6bf0892e32a29d34dced83f6cce2101747e SHA256 758c906e866b7ddb35b73b735d40b8850118fee000fff21fd7e91da3ad84bec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk/I7T0ACgkQC77qH+pIQ6Qo0QD6Az7R98R2yj1ae91PfnKHVPbU
-Fevrte4tEajG+mQQ05UA/1yLqdKJfoTJzPka5svbcwCGW0VB7ZxKlvbYuyI+pz6F
-=6LTp
+iF4EAREIAAYFAk/JQyEACgkQC77qH+pIQ6ToTwEAroUqXACUvmI38W6tU9eq28V7
+TCtlNNLFK6EkfAaQxIsBALO9kFpubTRrfyajX/AWz0chKJFIAGNlvCnAgK9ovRZr
+=xZbn
 -----END PGP SIGNATURE-----
diff --git a/app-shells/ksh/files/ksh-prefix.patch b/app-shells/ksh/files/ksh-prefix.patch
index cb701ee47cce..c97cbe333ca1 100644
--- a/app-shells/ksh/files/ksh-prefix.patch
+++ b/app-shells/ksh/files/ksh-prefix.patch
@@ -1,16 +1,15 @@
---- src/cmd/ksh93/data/msg.c
-+++ src/cmd/ksh93/data/msg.c
-@@ -154,32 +154,32 @@
- /* string constants */
- const char e_heading[]		= "Current option settings";
+--- a/src/cmd/ksh93/data/msg.c
++++ b/src/cmd/ksh93/data/msg.c
+@@ -180,7 +180,7 @@
  const char e_sptbnl[]		= " \t\n";
+ const char e_tolower[]		= "tolower";
+ const char e_toupper[]		= "toupper";
 -const char e_defpath[]		= "/bin:/usr/bin:";
--const char e_defedit[]		= "/bin/ed";
 +const char e_defpath[]		= "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:";
-+const char e_defedit[]		= "@GENTOO_PORTAGE_EPREFIX@/bin/ed";
+ const char e_defedit[]		= _pth_ed;
  const char e_unknown []		= "<command unknown>";
  const char e_devnull[]		= "/dev/null";
- const char e_traceprompt[]	= "+ ";
+@@ -188,24 +188,24 @@
  const char e_supprompt[]	= "# ";
  const char e_stdprompt[]	= "$ ";
  const char e_profile[]		= "$HOME/.profile";
diff --git a/app-shells/ksh/ksh-93.20120229.ebuild b/app-shells/ksh/ksh-93.20120229.ebuild
index f9e406ea83cc..6cd08a1dde3b 100644
--- a/app-shells/ksh/ksh-93.20120229.ebuild
+++ b/app-shells/ksh/ksh-93.20120229.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ksh-93.20120229.ebuild,v 1.4 2012/06/01 16:26:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ksh-93.20120229.ebuild,v 1.5 2012/06/01 22:32:59 floppym Exp $
 
 EAPI=4
 
@@ -33,8 +33,8 @@ src_prepare() {
 	sed -i -e 's,cd /tmp,cd "${TMPDIR:-/tmp}",' \
 		bin/package src/cmd/INIT/package.sh || die
 
-	#epatch "${FILESDIR}"/${PN}-prefix.patch
-	#eprefixify src/cmd/ksh93/data/msg.c
+	epatch "${FILESDIR}"/${PN}-prefix.patch
+	eprefixify src/cmd/ksh93/data/msg.c
 }
 
 src_compile() {