gentoo resync : 31.01.2018

3 files changed, 90 insertions, 0 deletions

diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 3845127389a6..d019ad6f5b53 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,8 +1,11 @@
 AUX cpp.patch 865 BLAKE2B 01f3d7827a53c5906f0883625e52ee2e92f4827444fd8d2ace95506eb0c20cb19b113ed789e11cdffd45e24dd1481cd7283bc7b4ac0fd7571e23aa74c5973cb2 SHA512 68b50627a548cfda24579ae5316ec1e42a959d6533df2c88dda572b0432e0080f0b6e4cbaa7a9a7f148a0f89ac1bda36ed414850a00fccfb36c2782a349fb1b5
+AUX ksh-prefix-r1.patch 2186 BLAKE2B 6d5e9bba057ab45a83936b8bd17966d6ff702917e19136ae5f06b6d53dddb70fedd4027e93870f1ea069d843584198ce82f03a0f92ce3c1fc01cd04f7e1c4e51 SHA512 0644ceebbcf003cce18b911e25d7979d68b22a051c9fea1cef0560b453cf533ec10d94354f1da558ecfa936392a3e82fcbf0cd77491ac9c58a1513860cee7ef5
 AUX ksh-prefix.patch 1780 BLAKE2B 21e49e421f82088e1d7ca0ed7a983b18ea9e2827c7a33e2865cab08ab7af379f0febae66eb1d3c64b246afe37a1c881365c65ec24d660a398b851262682fe1b2 SHA512 32ae89b988cc0bed839039646f5658c7a1e64b6b8a85ba4afecd02cfda4d6b64a968a4f8da8d290b90357b9b6231c609c51f4989935cc56ea378b5032569c315
 DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730
 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737
 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688
+DIST ksh-93.20180129.tar.gz 16056700 BLAKE2B a4f31243c67aa91d67a2d0f456053b716f0ee3ee58c5ef6c4bea236d7b58676170f236d36e084086c24b53b431cf8b88b174f9c92f8f94f27073c7a6ef2859c6 SHA512 6f2ec44f756bdeb8d8792cf55a2c19b38ea85947658648f521cf895562211604e2395cf60a5e72c451213065326207eb7a67c2efb768581ce84abbe11c237319
 EBUILD ksh-93.20140625.ebuild 1173 BLAKE2B 7e22ecae92c085791bacbb4ae8cad410a5abc18f6901a0e9667f9558cb3788e327acf73ebe10abb63723a7f6b97480c82873317a105aa120e99579271b6415d6 SHA512 9b93f2101fcc17470fdab5facd402143971edbcf06ffff74b6a969dbd7340d863bbd5a825e852bc661e3db52fc32542aa37a3507c9889ffd24a0f89da367b53c
 EBUILD ksh-93.20160110.ebuild 1115 BLAKE2B 12d12b1e67a4aa4b8d0157da5e3a1197d473e1c3339d928403019be1f5bb45348d6ca3522cc8aa5868e5ab4ef75647753e6a5eb98bee4e245fcb0eb2766986ba SHA512 09e6068ad0b4393a5b60ff40324045856b2ad8ed36fcb14d04412552ab601bad8305ddd1f9267a6382f06f64c6bf2058235391e850adbf2ffd39a9433b830f17
+EBUILD ksh-93.20180129.ebuild 722 BLAKE2B 0c7ad57c348ba9a9188b5561d811c9c9a0d4eb46eaf1ae9046da7a63775798d931d05df30bf046f666da6da974b6f02d3ca926e11a06b1dc29c79af71660c5b1 SHA512 5c65d377b3dc426dfe3195fbaae331cecb2ab0076a45db2f806a61db0954356720cd6af0ef33c6957ecd57d2f5acbfec5b839a6c1fa12578cf9b43cfe2c7dea1
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/files/ksh-prefix-r1.patch b/app-shells/ksh/files/ksh-prefix-r1.patch
new file mode 100644
index 000000000000..d2cfd6c0c154
--- /dev/null
+++ b/app-shells/ksh/files/ksh-prefix-r1.patch
@@ -0,0 +1,51 @@
+From b7769b1f336ba533c4510f1b112fecf84a638a08 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 28 Jan 2018 16:14:42 -0500
+Subject: [PATCH] EPREFIX support
+
+---
+ src/cmd/ksh93/data/msg.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/cmd/ksh93/data/msg.c b/src/cmd/ksh93/data/msg.c
+index eabe59e2..61512280 100644
+--- a/src/cmd/ksh93/data/msg.c
++++ b/src/cmd/ksh93/data/msg.c
+@@ -182,7 +182,7 @@ const char e_heading[] = "Current option settings";
+ 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_defpath[] = "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:";
+ const char e_defedit[] = _pth_ed;
+ const char e_unknown[] = "<command unknown>";
+ const char e_devnull[] = "/dev/null";
+@@ -190,19 +190,19 @@ 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_sysrc[] = "/etc/ksh.kshrc";
++const char e_sysprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/profile";
++const char e_suidprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile";
++const char e_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc";
+ #if SHOPT_BASH
+-const char e_bash_sysrc[] = "/etc/bash.bashrc";
++const char e_bash_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc";
+ 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  // SHOPT_BASH
+-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";
+-const char e_suidexec[] = "/etc/suid_exec";
++const char e_suidexec[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec";
+ const char hist_fname[] = "/.sh_history";
+ const char e_dot[] = ".";
+ const char e_envmarker[] = "A__z";
+-- 
+2.16.1
+
diff --git a/app-shells/ksh/ksh-93.20180129.ebuild b/app-shells/ksh/ksh-93.20180129.ebuild
new file mode 100644
index 000000000000..e49bb4ef303b
--- /dev/null
+++ b/app-shells/ksh/ksh-93.20180129.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson prefix
+
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="http://www.kornshell.com/"
+
+COMMIT="c266cbe4ecbc16adc66a2d5c9ea17fa4497284c8"
+SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!app-shells/pdksh"
+
+S="${WORKDIR}/ast-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/ksh-prefix-r1.patch
+)
+
+src_prepare() {
+	default
+	eprefixify src/cmd/ksh93/data/msg.c
+}
+
+src_install() {
+	meson_src_install
+	dodir /bin
+	mv "${ED%/}"{/usr,}/bin/ksh || die
+}