Re: [gentoo-proxy-maint] [PATCH v3 2/2] app-shells/mksh: Add USE=lksh

[Michał Górny]

On Mon, 2019-11-25 at 08:27 +0100, Haelwenn (lanodan) Monnier wrote:
> lksh is a variant of mksh intended for legacy scripts and strict
> POSIX-compatibility
>
> Signed-off-by: Haelwenn (lanodan) Monnier <contact@×××××××××.me>
> ---
>  app-shells/mksh/metadata.xml      |  6 ++++++
>  app-shells/mksh/mksh-57-r2.ebuild | 28 +++++++++++++++++++++++++++-
>  app-shells/mksh/mksh-9999.ebuild  | 28 +++++++++++++++++++++++++++-
>  3 files changed, 60 insertions(+), 2 deletions(-)
>
> diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
> index 9df017effeb..c22c0afc77d 100644
> --- a/app-shells/mksh/metadata.xml
> +++ b/app-shells/mksh/metadata.xml
> @@ -9,4 +9,10 @@
>  		<email>proxy-maint@g.o</email>
>  		<name>Proxy Maintainers</name>
>  	</maintainer>
> +	<use>
> +		<flag name="lksh">
> +variant that uses POSIX-compliant arithmetics with the host “long” data type
> +and is automatically in POSIX mode when called as /bin/sh
> +		</flag>
> +	</use>
>  </pkgmetadata>
> diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
> index b818b1caf1a..7e960b91fc5 100644
> --- a/app-shells/mksh/mksh-57-r2.ebuild
> +++ b/app-shells/mksh/mksh-57-r2.ebuild
> @@ -23,7 +23,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
>
>  LICENSE="BSD"
>  SLOT="0"
> -IUSE="static test"
> +IUSE="lksh static test"
>  RESTRICT="!test? ( test )"
>
>  DEPEND="
> @@ -35,10 +35,25 @@ DEPEND="
>
>  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
>  }
>
> @@ -47,8 +62,19 @@ src_install() {
>  	dobin mksh
>  	doman mksh.1
>  	dodoc dot.mkshrc
> +
> +	dobin "${S}"_lksh/lksh
> +	doman "${S}"_lksh/lksh.1
>  }
>
>  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-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
> index b818b1caf1a..7e960b91fc5 100644
> --- a/app-shells/mksh/mksh-9999.ebuild
> +++ b/app-shells/mksh/mksh-9999.ebuild
> @@ -23,7 +23,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
>
>  LICENSE="BSD"
>  SLOT="0"
> -IUSE="static test"
> +IUSE="lksh static test"
>  RESTRICT="!test? ( test )"
>
>  DEPEND="
> @@ -35,10 +35,25 @@ DEPEND="
>
>  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
>  }
>
> @@ -47,8 +62,19 @@ src_install() {
>  	dobin mksh
>  	doman mksh.1
>  	dodoc dot.mkshrc
> +
> +	dobin "${S}"_lksh/lksh
> +	doman "${S}"_lksh/lksh.1

You're missing big 'if use lksh' here and above.

I'll just fix that and merge.  Thanks.

>  }
>
>  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
>  }

-- 
Best regards,
Michał Górny