app-shells/mksh: USE=static now uses the system libc

Which means that glibc needs to be masked as it's static-linking is
broken.

I considered dietlibc as a replacement to klibc but:
- dietlibc is maintained-needed too
- it could be a elibc_glibc? in DEPEND but this would probably be a
noblah USE flag
- it would mean that arches where mksh is believed to work and some of
our libc do but not dietlibc or klibc (like alpha with bug #487672)
would be prevented from USE=static

Closes: https://bugs.gentoo.org/653388
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Signed-off-by: Michał Górny <mgorny@gentoo.org>

2 files changed, 63 insertions, 7 deletions

diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
new file mode 100644
index 000000000000..b818b1caf1a2
--- /dev/null
+++ b/app-shells/mksh/mksh-57-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 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=""
+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 ~sh ~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="static test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-lang/perl
+		sys-apps/ed
+	)
+"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	use static && export LDSTATIC="-static"
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	sh Build.sh -r || die
+}
+
+src_install() {
+	into /
+	dobin mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+}
+
+src_test() {
+	./mksh test.sh -v || die
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 3aa638fe2453..b818b1caf1a2 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -13,29 +13,31 @@ if [[ $PV = 9999 ]]; then
 	ECVS_AUTH="ext"
 	KEYWORDS=""
 else
-	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	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 ~sh ~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="static test"
-RDEPEND="static? ( dev-libs/klibc )"
+RESTRICT="!test? ( test )"
+
 DEPEND="
-	${RDEPEND}
 	test? (
 		dev-lang/perl
 		sys-apps/ed
 	)
 "
+
 S="${WORKDIR}/${PN}"
 
 src_compile() {
 	tc-export CC
-	# we want to build static with klibc
-	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	use static && export LDSTATIC="-static"
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	sh Build.sh -r || die
 }
@@ -48,5 +50,5 @@ src_install() {
 }
 
 src_test() {
-	./test.sh -v || die
+	./mksh test.sh -v || die
 }