gentoo resync : 18.12.2020

5 files changed, 13 insertions, 90 deletions

diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 6656454ec8d8..cac564f33ec5 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,8 +1,6 @@
-DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
-DIST mksh-R58.tgz 435617 BLAKE2B c5dd16effc8c08ac5f4a3986a14d786990b64d9da76b1b7d27de8a2dfbfa6fe172e9c58681df8f428a1e3548e54b5f6b037714a924f1053bfa3eedacc8eba173 SHA512 711351f8bbe8e44fcf9e7963f8e749938ec3ccb362fafd5350d44593841c2acb6d54ffa115dbb6b83c30865728a4c5274c05feedb063e293361e2830d263d80f
 DIST mksh-R59.tgz 438821 BLAKE2B 4a737b47ab58a99707d93b680ec5474b7b6e190241778010879d0b20028f97bfca9b526c807ed0b37d03b6aef9a2eaf2506d73d1a00ac14b60b21e57791d8d4f SHA512 be5009ce8f02eab1392f95d7f85f5aad57b1445684b4fe8cd0284a7d79386170979303ef19f039fdbb53bd2a791f3e3603d2fe57e015fed4cb4a24ab710bcfbb
-EBUILD mksh-57-r2.ebuild 1634 BLAKE2B d52a0e303f6497382783afef1022ae09ae2a7a0a8d8cd070bbc23aaeb2f24c318540713fa476a267e8b91a074349065b5ed803b08b9de0beddd23d4f392d87d2 SHA512 2175d226c2e61da5dfa3d38930302e448971be92c6db47567edc82bf36a7db296db9e3fe0f6ff340d2b38c0f93e6d97ad5490eb269ed6f3c031685604f9f20b1
-EBUILD mksh-58.ebuild 1592 BLAKE2B d446f1a29cd10d3d9d19f88eab9a37a3e2ef38eccaa210d4366156fb5498f4e7e2752ea8dd51ba52179072e206a88c974cbf4387ca32f6256683e6086b5098e6 SHA512 149e584f485bc1a49dafe104946a569ad6f167217773cf25d680864abfb000d11a028e1b89ae59148955eb7d6c4c20e9a2220962bef138d171c151269e270d59
-EBUILD mksh-59.ebuild 1611 BLAKE2B b46357f845cf618cc6066ddb8aedc5e344b056047cad4434ce733a0c0024c9ed4bde68c95ea98bc91a47af2e88336e91b8e12c40c12ec960f45da0b789afdd01 SHA512 50f881b316c31ebf86c121c5c961e91d53da47f2879dab4a9fd30597d65d3b71b986011328da330a9b1e3b46c411b2eb44d87d34b7e544829d3c68dafcb10602
-EBUILD mksh-9999.ebuild 1615 BLAKE2B f3e78819674ff13d6e7562bc7c8cf9969bc479f8f12e23ce9f7ae136749e12d2149c1f48522902a46077210af5b64a90720413f10aabfd04cfd82d3d03a7f0b6 SHA512 38da9578d15a8541107e596fd2df28cfa19e9c28446fbd312133afad0d2a78ebc8b157076776e8736f5feb6c5fc9cad9cd79a105e8a57a7bb935caff1022a1f9
+DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
+EBUILD mksh-59.ebuild 1608 BLAKE2B 1eb58f889cae37ed38ca3ad86c0d4b74659c209695a9d72c32931808cc60f2d4bcf59648b6073d7b96c0a12431ce2b989bcecdd36ec73d45150cd460151c312c SHA512 4155e31d97fcf0b3a008e4fb947d7cc85108d2a978280b2232b60e51964a6675d82ee85db80996bc35936085549e828a00781cdceb51e0e78138871cc8e90cb6
+EBUILD mksh-59c.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
+EBUILD mksh-9999.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
 MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
deleted file mode 100644
index d1d0012bb68b..000000000000
--- a/app-shells/mksh/mksh-57-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ $PV = 9999 ]]; then
-	inherit cvs
-	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
-	ECVS_MODULE="mksh"
-	ECVS_USER="_anoncvs"
-	ECVS_AUTH="ext"
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-else
-	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MirBSD Korn Shell"
-# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
-HOMEPAGE="http://mirbsd.de/mksh"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="lksh static test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-lang/perl
-		sys-apps/ed
-	)
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	if use lksh; then
-		cp -pr "${S}" "${S}"_lksh || die
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	use static && export LDSTATIC="-static"
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-
-	if use lksh; then
-		pushd "${S}"_lksh >/dev/null || die
-		CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
-			sh Build.sh -r -L || die
-		popd >/dev/null || die
-	fi
-
-	sh Build.sh -r || die
-}
-
-src_install() {
-	into /
-	dobin mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-
-	if use lksh; then
-		dobin "${S}"_lksh/lksh
-		doman "${S}"_lksh/lksh.1
-	fi
-}
-
-src_test() {
-	einfo "Testing regular mksh."
-	./mksh test.sh -v || die
-
-	if use lksh; then
-		einfo "Testing lksh, POSIX long-bit mksh."
-		pushd "${S}"_lksh >/dev/null || die
-		./lksh test.sh -v || die
-		popd >/dev/null || die
-	fi
-}
diff --git a/app-shells/mksh/mksh-59.ebuild b/app-shells/mksh/mksh-59.ebuild
index 6054ce4415ca..c8ea10cc1684 100644
--- a/app-shells/mksh/mksh-59.ebuild
+++ b/app-shells/mksh/mksh-59.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	ECVS_AUTH="ext"
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/mksh/mksh-58.ebuild b/app-shells/mksh/mksh-59c.ebuild
index a3e79a49d42e..d1e1e13e083f 100644
--- a/app-shells/mksh/mksh-58.ebuild
+++ b/app-shells/mksh/mksh-59c.ebuild
@@ -54,16 +54,20 @@ src_compile() {
 	fi
 
 	sh Build.sh -r || die
+	sh FAQ2HTML.sh || die
 }
 
 src_install() {
 	into /
 	dobin mksh
+	dosym mksh /bin/rmksh
 	doman mksh.1
 	dodoc dot.mkshrc
+	dodoc FAQ.htm
 
 	if use lksh; then
 		dobin "${S}"_lksh/lksh
+		dosym lksh /bin/rlksh
 		doman "${S}"_lksh/lksh.1
 	fi
 }
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 42d3bbb2ec9c..d1e1e13e083f 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -54,17 +54,20 @@ src_compile() {
 	fi
 
 	sh Build.sh -r || die
+	sh FAQ2HTML.sh || die
 }
 
 src_install() {
 	into /
 	dobin mksh
+	dosym mksh /bin/rmksh
 	doman mksh.1
 	dodoc dot.mkshrc
-	dosym mksh /bin/rmksh
+	dodoc FAQ.htm
 
 	if use lksh; then
 		dobin "${S}"_lksh/lksh
+		dosym lksh /bin/rlksh
 		doman "${S}"_lksh/lksh.1
 	fi
 }