1 |
commit: 46cc6eaa9b024f87198d2c6e8f91ea041e80399b |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 28 21:22:38 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 21:25:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cc6eaa |
7 |
|
8 |
app-shells/ksh: bump to 93.20180128 |
9 |
|
10 |
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45 |
11 |
|
12 |
app-shells/ksh/Manifest | 1 + |
13 |
app-shells/ksh/files/ksh-prefix-r1.patch | 51 ++++++++++++++++++++++++++++++++ |
14 |
app-shells/ksh/ksh-93.20180128.ebuild | 36 ++++++++++++++++++++++ |
15 |
3 files changed, 88 insertions(+) |
16 |
|
17 |
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest |
18 |
index a7b9569906b..caf1dcac4ed 100644 |
19 |
--- a/app-shells/ksh/Manifest |
20 |
+++ b/app-shells/ksh/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 |
23 |
DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 |
24 |
DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 |
25 |
+DIST ksh-93.20180128.tar.gz 16076705 BLAKE2B 1787a883827211f7573a97c78c4b7fca10ea9ca91ada66b148942bdbd36039bb420a6a44659010e870303e8840bf34828233130626c997d5bc264301880b35ad SHA512 d88e369aa79a273971756111d3c019a0dea830bb4ae26741fe91f4182ac46a4d178452a36433ee26db64ad8ec7dd2b003bb50acf51868a28ee1c7203a7f10f4a |
26 |
|
27 |
diff --git a/app-shells/ksh/files/ksh-prefix-r1.patch b/app-shells/ksh/files/ksh-prefix-r1.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..d2cfd6c0c15 |
30 |
--- /dev/null |
31 |
+++ b/app-shells/ksh/files/ksh-prefix-r1.patch |
32 |
@@ -0,0 +1,51 @@ |
33 |
+From b7769b1f336ba533c4510f1b112fecf84a638a08 Mon Sep 17 00:00:00 2001 |
34 |
+From: Mike Gilbert <floppym@g.o> |
35 |
+Date: Sun, 28 Jan 2018 16:14:42 -0500 |
36 |
+Subject: [PATCH] EPREFIX support |
37 |
+ |
38 |
+--- |
39 |
+ src/cmd/ksh93/data/msg.c | 14 +++++++------- |
40 |
+ 1 file changed, 7 insertions(+), 7 deletions(-) |
41 |
+ |
42 |
+diff --git a/src/cmd/ksh93/data/msg.c b/src/cmd/ksh93/data/msg.c |
43 |
+index eabe59e2..61512280 100644 |
44 |
+--- a/src/cmd/ksh93/data/msg.c |
45 |
++++ b/src/cmd/ksh93/data/msg.c |
46 |
+@@ -182,7 +182,7 @@ const char e_heading[] = "Current option settings"; |
47 |
+ const char e_sptbnl[] = " \t\n"; |
48 |
+ const char e_tolower[] = "tolower"; |
49 |
+ const char e_toupper[] = "toupper"; |
50 |
+-const char e_defpath[] = "/bin:/usr/bin:"; |
51 |
++const char e_defpath[] = "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:"; |
52 |
+ const char e_defedit[] = _pth_ed; |
53 |
+ const char e_unknown[] = "<command unknown>"; |
54 |
+ const char e_devnull[] = "/dev/null"; |
55 |
+@@ -190,19 +190,19 @@ const char e_traceprompt[] = "+ "; |
56 |
+ const char e_supprompt[] = "# "; |
57 |
+ const char e_stdprompt[] = "$ "; |
58 |
+ const char e_profile[] = "$HOME/.profile"; |
59 |
+-const char e_sysprofile[] = "/etc/profile"; |
60 |
+-const char e_suidprofile[] = "/etc/suid_profile"; |
61 |
+-const char e_sysrc[] = "/etc/ksh.kshrc"; |
62 |
++const char e_sysprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/profile"; |
63 |
++const char e_suidprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile"; |
64 |
++const char e_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc"; |
65 |
+ #if SHOPT_BASH |
66 |
+-const char e_bash_sysrc[] = "/etc/bash.bashrc"; |
67 |
++const char e_bash_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc"; |
68 |
+ const char e_bash_rc[] = "$HOME/.bashrc"; |
69 |
+ const char e_bash_login[] = "$HOME/.bash_login"; |
70 |
+ const char e_bash_logout[] = "$HOME/.bash_logout"; |
71 |
+ const char e_bash_profile[] = "$HOME/.bash_profile"; |
72 |
+ #endif // SHOPT_BASH |
73 |
+-const char e_crondir[] = "/usr/spool/cron/atjobs"; |
74 |
++const char e_crondir[] = "@GENTOO_PORTAGE_EPREFIX@/usr/spool/cron/atjobs"; |
75 |
+ const char e_prohibited[] = "login setuid/setgid shells prohibited"; |
76 |
+-const char e_suidexec[] = "/etc/suid_exec"; |
77 |
++const char e_suidexec[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec"; |
78 |
+ const char hist_fname[] = "/.sh_history"; |
79 |
+ const char e_dot[] = "."; |
80 |
+ const char e_envmarker[] = "A__z"; |
81 |
+-- |
82 |
+2.16.1 |
83 |
+ |
84 |
|
85 |
diff --git a/app-shells/ksh/ksh-93.20180128.ebuild b/app-shells/ksh/ksh-93.20180128.ebuild |
86 |
new file mode 100644 |
87 |
index 00000000000..32db068808f |
88 |
--- /dev/null |
89 |
+++ b/app-shells/ksh/ksh-93.20180128.ebuild |
90 |
@@ -0,0 +1,36 @@ |
91 |
+# Copyright 1999-2018 Gentoo Foundation |
92 |
+# Distributed under the terms of the GNU General Public License v2 |
93 |
+ |
94 |
+EAPI=6 |
95 |
+ |
96 |
+inherit meson prefix |
97 |
+ |
98 |
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" |
99 |
+HOMEPAGE="http://www.kornshell.com/" |
100 |
+ |
101 |
+COMMIT="0c8dbe3001d1bbef4f76673dc9c1629d90da9862" |
102 |
+SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz" |
103 |
+ |
104 |
+LICENSE="CPL-1.0 EPL-1.0" |
105 |
+SLOT="0" |
106 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
107 |
+IUSE="" |
108 |
+ |
109 |
+RDEPEND="!app-shells/pdksh" |
110 |
+ |
111 |
+S="${WORKDIR}/ast-${COMMIT}" |
112 |
+ |
113 |
+PATCHES=( |
114 |
+ "${FILESDIR}"/ksh-prefix-r1.patch |
115 |
+) |
116 |
+ |
117 |
+src_prepare() { |
118 |
+ default |
119 |
+ eprefixify src/cmd/ksh93/data/msg.c |
120 |
+} |
121 |
+ |
122 |
+src_install() { |
123 |
+ meson_src_install |
124 |
+ dodir /bin |
125 |
+ mv "${ED%/}"{/usr,}/bin/ksh || die |
126 |
+} |