[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/files/, app-shells/ksh/

[Mike Gilbert]

commit:     a3d3021af084e1b75ba80eaf575ce11870fa35ae
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 16:03:13 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May  4 16:03:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d3021a

app-shells/ksh: remove old

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-shells/ksh/Manifest                  |  2 --
 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.20180215.ebuild    | 36 ----------------------
 app-shells/ksh/ksh-93.20180331.ebuild    | 36 ----------------------
 6 files changed, 191 deletions(-)

diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index ce546d54207..175a6d279d8 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,3 +1 @@
 DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981
-DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b
-DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196

diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch
deleted file mode 100644
index 7075bcfc1f7..00000000000
--- a/app-shells/ksh/files/cpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index d2cfd6c0c15..00000000000
--- a/app-shells/ksh/files/ksh-prefix-r1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b7769b1f336ba533c4510f1b112fecf84a638a08 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@g.o>
-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/files/ksh-prefix.patch b/app-shells/ksh/files/ksh-prefix.patch
deleted file mode 100644
index c97cbe333ca..00000000000
--- a/app-shells/ksh/files/ksh-prefix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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 []		= "<command 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.20180215.ebuild b/app-shells/ksh/ksh-93.20180215.ebuild
deleted file mode 100644
index 576ab31e881..00000000000
--- a/app-shells/ksh/ksh-93.20180215.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
deleted file mode 100644
index 5d2cbc31a7d..00000000000
--- a/app-shells/ksh/ksh-93.20180331.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-}