gentoo resync : 04.05.2019

4 files changed, 82 insertions, 26 deletions

diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index c17322be4481..0e3c010d9b75 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,6 +1,7 @@
 DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
 EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
+EBUILD mksh-57-r1.ebuild 1010 BLAKE2B da381d59adade8902014bf730bbecf56730de750f81ea4462f904ec4459cd0f23bdf9ebb4a284f9b408b3e3cbcc08f80d124ba1c5269325a5619e4113a03c2b5 SHA512 6d9a8435f42fcf1a08a2d0a21daf95bc4706d704b0d9281e3efef49d06e4d0e557349c4e80ee8056e8543774ddb1b268847ae69ab6c62fb216fefa4647a69b16
 EBUILD mksh-57.ebuild 995 BLAKE2B 0e9efe4a046e26c35f3b5882e6fc6f81adb85f47acd9e84f7de768e6557e2725dcea05a18b30d8ff26e20383a452a4ba434c6dfebcb8476ce7c03fef8a2aa8da SHA512 e259c3b4c8cacc5655ea5fe444cacbcab8d646e4a1dbff949dfc8ffe2fb032a8c51cf1017c23f7b4191309285d08936a31a7791f0104384264865495f973e616
-EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD mksh-9999.ebuild 1010 BLAKE2B da381d59adade8902014bf730bbecf56730de750f81ea4462f904ec4459cd0f23bdf9ebb4a284f9b408b3e3cbcc08f80d124ba1c5269325a5619e4113a03c2b5 SHA512 6d9a8435f42fcf1a08a2d0a21daf95bc4706d704b0d9281e3efef49d06e4d0e557349c4e80ee8056e8543774ddb1b268847ae69ab6c62fb216fefa4647a69b16
+MISC metadata.xml 379 BLAKE2B b4d62877ff242c65d08dc06b33970d51545518b5e30dc231d1b700a47b984500ca8f64a77f705913070a51d7c45be61e1b9c25d4691d62142eabfec153dde5cb SHA512 ae67be4bd206bdc709c9d78f5256c8b286eae5383453d16156ce43a5fc389208053587284dfc339a4ed65a239304cc6ad40b87e0b4a6aec4695213beb1d69aff
diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
index 6f49eba8f496..9df017effeb6 100644
--- a/app-shells/mksh/metadata.xml
+++ b/app-shells/mksh/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/mksh/mksh-57-r1.ebuild b/app-shells/mksh/mksh-57-r1.ebuild
new file mode 100644
index 000000000000..3aa638fe2453
--- /dev/null
+++ b/app-shells/mksh/mksh-57-r1.ebuild
@@ -0,0 +1,52 @@
+# 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="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MirBSD Korn Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+LICENSE="BSD"
+SLOT="0"
+IUSE="static test"
+RDEPEND="static? ( dev-libs/klibc )"
+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
+	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() {
+	./test.sh -v || die
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 36449d037d42..3aa638fe2453 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 if [[ $PV = 9999 ]]; then
 	inherit cvs
@@ -12,45 +12,41 @@ if [[ $PV = 9999 ]]; then
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
 	KEYWORDS=""
-	DEPEND="static? ( dev-libs/klibc )"
 else
-	inherit unpacker
-	DEPEND="app-arch/cpio
-		static? ( dev-libs/klibc )"
-	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-IUSE="static"
-RDEPEND=""
+IUSE="static test"
+RDEPEND="static? ( dev-libs/klibc )"
+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 unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r -c lto || sh Rebuild.sh || die
+	sh Build.sh -r || die
 }
 
 src_install() {
-	exeinto /bin
-	doexe mksh
+	into /
+	dobin 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 $?
+	./test.sh -v || die
 }