4 files changed, 68 insertions, 17 deletions
diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog
index 313ad5299384..8573d0b0104f 100644
--- a/app-shells/mksh/ChangeLog
+++ b/app-shells/mksh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/mksh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.60 2015/01/01 10:31:00 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.61 2015/01/18 01:44:25 patrick Exp $
+
+*mksh-50d-r1 (18 Jan 2015)
+
+  18 Jan 2015; Patrick Lauer <patrick@gentoo.org> +mksh-50d-r1.ebuild,
+  mksh-9999.ebuild:
+  Add mksh to /etc/shells
 
   01 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> -mksh-48b.ebuild,
   -mksh-49.ebuild, -mksh-50b.ebuild, -mksh-50c.ebuild:
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index f2eef3d468ee..adcae0868d4e 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST mksh-R50d.tgz 374014 SHA256 a2268826a1463959ff7b7979fbf9176f1298400ecc24ae13d6337eee5c63f982 SHA512 1bb545d00e3ce5783541c88e1fea47cbd01e2103c60be7d6f5b8bf02d30576d543c4e9f6786b8d14785554c11ca1123364297a2cce0c5c3a5901b6e717594bd8 WHIRLPOOL 899b3feed7610328971b17195701dedf732507c52cd35c69bc2f3778243b344f7c8546871b7b728d122c99aa38c9b525aedeb8f5be8cd90ee2c74b32cb2ce64b
+EBUILD mksh-50d-r1.ebuild 1194 SHA256 09f9c13b91c9aeb6cb9b7918e24ec319a471b6bbd1317e2e0adba3403b73a8c7 SHA512 5603a2b03c1509808c07167a9717dbaefd86462e47321332e42b5f36cdb62d01c8d57b605912c4fa07c96281d5410877b518266679bd0d629ef29d6b69d95b2c WHIRLPOOL c14306441e2d4935f40a7fd9e35b30fb48622cb977ac5c5ed4873eca2421f2a5a9f04fae1577087bc715108a01bf09a8771d02e93e08f2445abddef4372796aa
 EBUILD mksh-50d.ebuild 1002 SHA256 f558dda188ba1e6db41f680c908af8f65184def698996057639062a4ea21f650 SHA512 4879587f1b5fc5afe491d50124869be65e43b680e619d210db6cea7153f6d87354768eac1532ce3f630684795b9688a750e3a987e2d29fff209c40d9c0525e11 WHIRLPOOL 89e5b1f517af345160abdce51906e117342e3738dc4ba522c2983faed875699e7edb42e892eeedf6868d1c20d618d70452189cbbb983570af1bd1f069a010dbf
-EBUILD mksh-9999.ebuild 1170 SHA256 7f921a13eb77f931d37acbfc92164040c1ed207336ff825b3ad5c7c255957bd2 SHA512 2305077bd12456aa7a37c689c4a2bcd3c3d874ff2ae75ae8e956973fc094bbe474e6f8ee9d9532156fbbdf1a9b909c1228ee105829fad9771dcd532a52cef2c6 WHIRLPOOL 4dfb39eff331686284b26888defe35f27945f8967761a348e1c40af1b9de6cf09053be9c6793af79f9e578888dbe80f5695e60d483fecd3728cbb974b51aac24
-MISC ChangeLog 7416 SHA256 518a674e33cdcfc5d311ebd3eb59d56d57df98a038269704f7811ef167813cbc SHA512 2a9c0396ddc2b53fa887386e066c98884436c0a23ffd64b4e46cafbdecc07d7513d9826b69e4f920121b7e9eb7780c1866c8fc26f6f0c40d52866855820e3c16 WHIRLPOOL 966bccd76a2c65acc0f9a79b135509ca72cedd3e6895971c1a5e8e489db35ebf43c207805ac81aa35977aa5d938bdfb73071efa9d3798e7c0b897482391cc1be
+EBUILD mksh-9999.ebuild 1352 SHA256 719bbe8cbb6167d6bce0b53b0e9334fbc0faf33ea7c5e93127440fae3c04c95f SHA512 feea88075bc6894e3516b56683e3d5b48ebda4dd1c371a3fb7086eedbe91da937e90b3f95ec67480552a07f5b2e57d698334df455fb46796eacfc01d804d6cce WHIRLPOOL 3491b75bbf30872857a4e481c234f3e78048416f407fb418e5b506c60762e98d33144f8641c6b489ada2e519ee8890a9d4f1355eea2359dd6e12f50088865430
+MISC ChangeLog 7562 SHA256 4e72951766a60f17d9026948f0a8fd9fc994be53a6f07cdc7bfb73d9dedf6f98 SHA512 3eca3df77932fb01387faf5ab911f5c5a2b1a07ccfb4e8ba6e618269fc289d01d66f4dfdc873d1659f54cbd875f2983187bb489e6f4a010813a52f64a1b47248 WHIRLPOOL 053ecc338ac1573d752745d2f64f1f07fd72a58deca8983247da3c2eb5a947eb8c731e2a31eb540208c8b5ee5a2a30f5b2389964dbdd8a7eb29558cd8fa02c07
 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlSlIYgACgkQG9wOWsQutdYrnQP/TgfFIVfO2V0lETnErV0gro0V
-Hq9NMVVFsILFkLltoZOw9a4GdlgYul/2M4gPT9xfrFbI5XjFPK00Jf/jPmBNaoKB
-5QWadaCCR12sIJa/6WKJl/6MIn3H9RFdLgy43iUwELB2rOPS5UkHDxwDhKoCxTPn
-AVHmC3V7TW0zKnqN6MM=
-=HuC/
------END PGP SIGNATURE-----
diff --git a/app-shells/mksh/mksh-50d-r1.ebuild b/app-shells/mksh/mksh-50d-r1.ebuild
new file mode 100644
index 000000000000..72381dcb2a2b
--- /dev/null
+++ b/app-shells/mksh/mksh-50d-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-50d-r1.ebuild,v 1.1 2015/01/18 01:44:25 patrick Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="static? ( dev-libs/klibc )"
+RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	# we want to build static with klibc
+	if use static ; then
+		unset CC
+		export CC="/usr/bin/klcc"
+		export LDSTATIC="-static"
+	fi
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	# we can't assume lto existing/enabled, so we add a fallback
+	sh Build.sh -r -c lto || sh Rebuild.sh || die
+}
+
+src_install() {
+	exeinto /bin
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+}
+
+src_test() {
+	./test.sh || die
+}
+
+pkg_postinst() {
+	ebegin "Updating /etc/shells"
+	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
+	mv -f "${T}"/shells "${ROOT}"etc/shells
+	eend $?
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 3cd2184d9674..f49c4dee0b1f 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.5 2013/04/07 06:05:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.6 2015/01/18 01:44:25 patrick Exp $
 
 EAPI=4
 
@@ -48,3 +48,10 @@ src_install() {
 src_test() {
 	./test.sh || die
 }
+
+pkg_postinst() {
+	ebegin "Updating /etc/shells"
+	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
+	mv -f "${T}"/shells "${ROOT}"etc/shells
+	eend $?
+}