From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-shells/ksh/Manifest | 13 ++++++++ app-shells/ksh/files/cpp.patch | 24 +++++++++++++++ app-shells/ksh/files/ksh-prefix-r1.patch | 51 ++++++++++++++++++++++++++++++++ app-shells/ksh/files/ksh-prefix.patch | 42 ++++++++++++++++++++++++++ app-shells/ksh/ksh-93.20140625.ebuild | 50 +++++++++++++++++++++++++++++++ app-shells/ksh/ksh-93.20160110.ebuild | 51 ++++++++++++++++++++++++++++++++ app-shells/ksh/ksh-93.20180215.ebuild | 36 ++++++++++++++++++++++ app-shells/ksh/ksh-93.20180331.ebuild | 36 ++++++++++++++++++++++ app-shells/ksh/metadata.xml | 30 +++++++++++++++++++ 9 files changed, 333 insertions(+) create mode 100644 app-shells/ksh/Manifest create mode 100644 app-shells/ksh/files/cpp.patch create mode 100644 app-shells/ksh/files/ksh-prefix-r1.patch create mode 100644 app-shells/ksh/files/ksh-prefix.patch create mode 100644 app-shells/ksh/ksh-93.20140625.ebuild create mode 100644 app-shells/ksh/ksh-93.20160110.ebuild create mode 100644 app-shells/ksh/ksh-93.20180215.ebuild create mode 100644 app-shells/ksh/ksh-93.20180331.ebuild create mode 100644 app-shells/ksh/metadata.xml (limited to 'app-shells/ksh') diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest new file mode 100644 index 000000000000..65bc64d3c38e --- /dev/null +++ b/app-shells/ksh/Manifest @@ -0,0 +1,13 @@ +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.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b +DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196 +EBUILD ksh-93.20140625.ebuild 1173 BLAKE2B 7e22ecae92c085791bacbb4ae8cad410a5abc18f6901a0e9667f9558cb3788e327acf73ebe10abb63723a7f6b97480c82873317a105aa120e99579271b6415d6 SHA512 9b93f2101fcc17470fdab5facd402143971edbcf06ffff74b6a969dbd7340d863bbd5a825e852bc661e3db52fc32542aa37a3507c9889ffd24a0f89da367b53c +EBUILD ksh-93.20160110.ebuild 1115 BLAKE2B 12d12b1e67a4aa4b8d0157da5e3a1197d473e1c3339d928403019be1f5bb45348d6ca3522cc8aa5868e5ab4ef75647753e6a5eb98bee4e245fcb0eb2766986ba SHA512 09e6068ad0b4393a5b60ff40324045856b2ad8ed36fcb14d04412552ab601bad8305ddd1f9267a6382f06f64c6bf2058235391e850adbf2ffd39a9433b830f17 +EBUILD ksh-93.20180215.ebuild 722 BLAKE2B 6b3b900d36db2c46fe2891f27393aa44bdadecc68857cca00ab2d04409674772cb21db97761a992c9689baa650b3182c83504f599e1e9c146d42cb7ed3147963 SHA512 4f27a2d631b422a9b0542e1843bc4d79f8ac54a15cd626dfe7f742aaf559afc667a0b0304c3b73ca4facc52e31a4976dea19d785b90e8ccacf67240d4fc07ed4 +EBUILD ksh-93.20180331.ebuild 722 BLAKE2B 3a20a7bc23ef3484482dd8ed6bc4397916dae259a1ddbf86edfa8c1c939ab9a8f41482fefdc8ba9bcd683317db53bfddbe740040a1dad9b40905f3435966d137 SHA512 3fea34756bd4bc63ed578b8621f9d6b2ae6d16fb6b6d9e05ac2ab818bba571760cabbee58e2e85fa60f31d8a2f816796ec9db56171a99ce03e8dd4b7c6cbb1dd +MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810 diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch new file mode 100644 index 000000000000..7075bcfc1f7f --- /dev/null +++ b/app-shells/ksh/files/cpp.patch @@ -0,0 +1,24 @@ +iffe depends on cc -E not inserting newlines between tokens + +https://build.opensuse.org/package/view_file/home:Andreas_Schwab:Factory/ksh/cpp.patch?expand=1 + +--- a/src/cmd/INIT/iffe.sh ++++ b/src/cmd/INIT/iffe.sh +@@ -3427,7 +3427,7 @@ + (eval "$src") <&$nullin || e=1 + ;; + mac*|nomac*) +- if compile $cc -E $tmp.c <&$nullin >$tmp.i ++ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i + then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i + else e=1 + fi +@@ -3718,7 +3718,7 @@ + <<\"#define $v\">> $v <<\"/* native $v */\">> + <<\"#endif\">> + #endif" > $tmp.c +- if compile $cc -E $tmp.c <&$nullin >$tmp.i ++ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i + then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i > $tmp.t + if test -s $tmp.t + then success 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 +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[] = ""; + 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/files/ksh-prefix.patch b/app-shells/ksh/files/ksh-prefix.patch new file mode 100644 index 000000000000..c97cbe333ca1 --- /dev/null +++ b/app-shells/ksh/files/ksh-prefix.patch @@ -0,0 +1,42 @@ +--- 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_defpath[] = "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:"; + const char e_defedit[] = _pth_ed; + const char e_unknown [] = ""; + const char e_devnull[] = "/dev/null"; +@@ -188,24 +188,24 @@ + 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.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild new file mode 100644 index 000000000000..c8a15396a51d --- /dev/null +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit toolchain-funcs prefix eutils + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="http://www.kornshell.com/" + +KSH_PV=${PV:3:4}-${PV:7:2}-${PV:9:2} + +SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz + https://dev.gentoo.org/~floppym/distfiles/ast-base.${KSH_PV}.tgz" + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="!app-shells/pdksh" + +S=${WORKDIR} + +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 + epatch "${FILESDIR}"/cpp.patch + eprefixify src/cmd/ksh93/data/msg.c +} + +src_compile() { + tc-export AR CC LD NM + export CCFLAGS="${CFLAGS}" + sh bin/package flat only make ast-ksh SHELL=sh SHOPT_SYSRC=1 || die +} + +src_install() { + dodoc lib/package/ast-base.README + dohtml lib/package/ast-base.html + + local myhost=$(sh bin/package host) + into / + dobin bin/ksh + dosym ksh /bin/rksh + newman man/man1/sh.1 ksh.1 +} diff --git a/app-shells/ksh/ksh-93.20160110.ebuild b/app-shells/ksh/ksh-93.20160110.ebuild new file mode 100644 index 000000000000..13f64f1a69ea --- /dev/null +++ b/app-shells/ksh/ksh-93.20160110.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs prefix eutils + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="http://www.kornshell.com/" + +COMMIT="c506cb548d9b4bcebef92c86e948657728760e15" +SRC_URI="https://github.com/att/ast/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="!app-shells/pdksh" + +S="${WORKDIR}/ast-${COMMIT}" + +PATCHES=( + "${FILESDIR}"/ksh-prefix.patch + "${FILESDIR}"/cpp.patch +) + +src_prepare() { + default + + # Bug 238906. + sed -i -e 's,cd /tmp,cd "${TMPDIR:-/tmp}",' \ + bin/package src/cmd/INIT/package.sh || die + + eprefixify src/cmd/ksh93/data/msg.c +} + +src_compile() { + tc-export AR CC LD NM + export CCFLAGS="${CFLAGS}" + sh bin/package flat only make ast-ksh SHELL=sh SHOPT_SYSRC=1 || die + # The build system doesn't exit properly + [[ -e bin/ksh ]] || die +} + +src_install() { + into / + dobin bin/ksh + dosym ksh /bin/rksh + newman man/man1/sh.1 ksh.1 +} diff --git a/app-shells/ksh/ksh-93.20180215.ebuild b/app-shells/ksh/ksh-93.20180215.ebuild new file mode 100644 index 000000000000..576ab31e881e --- /dev/null +++ b/app-shells/ksh/ksh-93.20180215.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="e3dd5b1a4b1bf58a018bbd9c8626b15113b72717" +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 +} diff --git a/app-shells/ksh/ksh-93.20180331.ebuild b/app-shells/ksh/ksh-93.20180331.ebuild new file mode 100644 index 000000000000..5d2cbc31a7d4 --- /dev/null +++ b/app-shells/ksh/ksh-93.20180331.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="b9d0b8ebfead0edba9004fc32b1782d1e1410aeb" +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 +} diff --git a/app-shells/ksh/metadata.xml b/app-shells/ksh/metadata.xml new file mode 100644 index 000000000000..6018c787c35e --- /dev/null +++ b/app-shells/ksh/metadata.xml @@ -0,0 +1,30 @@ + + + + + floppym@gentoo.org + Mike Gilbert + + + The KornShell language was designed and developed by David G. Korn at + AT&T Bell Laboratories. It is an interactive command language that + provides access to the UNIX system and to many other systems, on the + many different computers and workstations on which it is implemented. + + ksh has the functionality of other scripting languages such as awk, + icon, perl, rexx, and tcl. For this and many other reasons, ksh is a + much better scripting language than any of the other popular shells. + The code size for ksh is larger than the Bourne shell or C shell + programs. The revised version is even larger. + + In spite of its increased size, ksh provides better performance. You + can write programs to run faster with ksh than with either the Bourne + shell or the C shell, sometimes an order of magnitude faster. ksh has + evolved and matured with extensive user feedback. It has been used by + many thousands of people at AT&T since 1982, and at many other + companies and universities. + + + att/ast + + -- cgit v1.2.3