Import Gentoo Prefix modifications. offset patch, KEYWORDS, and build argument. Signed off my maintainer

Package-Manager: portage-2.1.10.60/cvs/Linux x86_64

4 files changed, 59 insertions, 17 deletions

diff --git a/app-shells/ksh/ChangeLog b/app-shells/ksh/ChangeLog
index 08b88940de12..9352c59d095e 100644
--- a/app-shells/ksh/ChangeLog
+++ b/app-shells/ksh/ChangeLog
@@ -1,6 +1,11 @@
 # 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.53 2012/04/01 17:41:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.54 2012/05/21 15:08:31 darkside Exp $
+
+  21 May 2012; Jeremy Olexa <darkside@gentoo.org> ksh-93.20120229.ebuild,
+  +files/ksh-prefix.patch:
+  Import Gentoo Prefix modifications. offset patch, KEYWORDS, and build
+  argument. Signed off my maintainer
 
   01 Apr 2012; Mike Gilbert <floppym@gentoo.org> -ksh-93.20071105.ebuild:
   Drop old version.
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 8e060d523456..03aeee076871 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX ksh-prefix.patch 1858 RMD160 6af07773b5fb9901f60f496bb25c35bac9f9598f SHA1 b38808607c7b7612f9dec1c963518775431c5107 SHA256 d2bc1935471fdaa609dbf3734cab0fcd0d8d5f597d78c7e2149a19c8b85c4b1a
 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 1340 RMD160 78045cd049a6a9c4df2856410043ae78417dd2c8 SHA1 61bb69a1da027750f197351396cf8b9b9241297c SHA256 2ce75ce80eed7d24d3a608124ebdcac0a6065410cbb9785b93eddc3c29c99646
-MISC ChangeLog 7076 RMD160 ea64151a4ed8ad5f1e81244bb4e71ea677adecfc SHA1 5cb0bb7fa6eb28ce0f0e0393558b12eb9fcaf040 SHA256 b480ba4103c7fd2ba7b4bc1fcd0696c59ade1670785dcd1bdb1c5f75b941b59c
+EBUILD ksh-93.20120229.ebuild 1463 RMD160 7ae3ef8a6efb88722f63a4cb8a61ec83326c96c7 SHA1 07e5e420841e83e4222bf1b71c0e5ba03d0f3e4b SHA256 361277958e24a0ec1210c6f5ad78473b131070850c0a866f2e3835861798e401
+MISC ChangeLog 7288 RMD160 49c270ae83116c9bc193f2c80e3a13c641d9734f SHA1 3dd23383183be2d23604c6493dd9985bdd70da39 SHA256 fef653367d0690d72d4489bd6c8031a69d622631de8d4fa648b0870c7e5b4066
 MISC metadata.xml 1375 RMD160 4fb592833be50e59fe290afcce3ccebfe8948dab SHA1 77d9a6bf0892e32a29d34dced83f6cce2101747e SHA256 758c906e866b7ddb35b73b735d40b8850118fee000fff21fd7e91da3ad84bec3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk94k18ACgkQC77qH+pIQ6Q+5QD/d2bfxM+Jc2JDSNXLLEzF1++v
-AN7NroXlxkJ/ftoORCIA/06IqasUIMA4vqOJQp0CuH28mNyk9h/9nzJ4MGoJP7y9
-=Ggtz
------END PGP SIGNATURE-----
diff --git a/app-shells/ksh/files/ksh-prefix.patch b/app-shells/ksh/files/ksh-prefix.patch
new file mode 100644
index 000000000000..cb701ee47cce
--- /dev/null
+++ b/app-shells/ksh/files/ksh-prefix.patch
@@ -0,0 +1,43 @@
+--- 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";
+ const char e_sptbnl[]		= " \t\n";
+-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_unknown []		= "<command unknown>";
+ const char e_devnull[]		= "/dev/null";
+ const char e_traceprompt[]	= "+ ";
+ const char e_supprompt[]	= "# ";
+ const char e_stdprompt[]	= "$ ";
+ const char e_profile[]		= "$HOME/.profile";
+-const char e_sysprofile[]	= "/etc/profile";
+-const char e_suidprofile[]	= "/etc/suid_profile";
++const char e_sysprofile[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/profile";
++const char e_suidprofile[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile";
+ #if SHOPT_SYSRC
+-const char e_sysrc[]		= "/etc/ksh.kshrc";
++const char e_sysrc[]		= "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc";
+ #endif
+ #if SHOPT_BASH
+ #if SHOPT_SYSRC
+-const char e_bash_sysrc[]	= "/etc/bash.bashrc";
++const char e_bash_sysrc[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc";
+ #endif
+ const char e_bash_rc[]		= "$HOME/.bashrc";
+ const char e_bash_login[]	= "$HOME/.bash_login";
+ const char e_bash_logout[]	= "$HOME/.bash_logout";
+ const char e_bash_profile[]	= "$HOME/.bash_profile";
+ #endif
+-const char e_crondir[]		= "/usr/spool/cron/atjobs";
++const char e_crondir[]		= "@GENTOO_PORTAGE_EPREFIX@/usr/spool/cron/atjobs";
+ const char e_prohibited[]	= "login setuid/setgid shells prohibited";
+ #if SHOPT_SUID_EXEC
+-   const char e_suidexec[]	= "/etc/suid_exec";
++   const char e_suidexec[]	= "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec";
+ #endif /* SHOPT_SUID_EXEC */
+ const char hist_fname[]		= "/.sh_history";
+ const char e_dot[]		= ".";
diff --git a/app-shells/ksh/ksh-93.20120229.ebuild b/app-shells/ksh/ksh-93.20120229.ebuild
index efc704ee64be..d46237d39875 100644
--- a/app-shells/ksh/ksh-93.20120229.ebuild
+++ b/app-shells/ksh/ksh-93.20120229.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2012/03/18 03:54:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ksh-93.20120229.ebuild,v 1.2 2012/05/21 15:08:31 darkside Exp $
 
 EAPI=4
 
-inherit toolchain-funcs versionator
+inherit toolchain-funcs versionator prefix
 
 DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
 HOMEPAGE="http://www.kornshell.com/"
@@ -21,7 +21,7 @@ SRC_URI="mirror://gentoo/INIT.$(ksh_release).tgz
 
 LICENSE="CPL-1.0 EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="!app-shells/pdksh"
@@ -32,12 +32,15 @@ src_prepare() {
 	# Bug 238906.
 	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
 }
 
 src_compile() {
 	tc-export AR CC LD NM
 	export CCFLAGS="${CFLAGS}"
-	sh bin/package only make ast-ksh SHELL=/bin/sh SHOPT_SYSRC=1 || die
+	sh bin/package only make ast-ksh SHELL="${EPREFIX}"/bin/sh SHOPT_SYSRC=1 || die
 }
 
 src_install() {