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

(Portage version: 2.1.10.60/cvs/Linux x86_64)

3 files changed, 56 insertions, 5 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/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() {