summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-03-17 11:23:33 +0100
committerMichał Górny <mgorny@gentoo.org>2019-04-29 15:41:06 +0200
commit6d2258d85eac24a106a262a6d12cb02b434d2f8c (patch)
treeaf442aaccee5f460c9018c8c914cf7a4e0e37119 /app-shells/mksh
parentapp-shells/mksh: Assign myself as p-maintainer (diff)
downloadgentoo-6d2258d85eac24a106a262a6d12cb02b434d2f8c.tar.gz
gentoo-6d2258d85eac24a106a262a6d12cb02b434d2f8c.tar.bz2
gentoo-6d2258d85eac24a106a262a6d12cb02b434d2f8c.zip
app-shells/mksh: Fix the live ebuild
- mksh changed to tarballs so cpio and unpacker is now removed. - Update keywords from release ebuild - Rebuild.sh is useless for us - Bump to EAPI 7 - Remove shell updater as mksh is in baselayout - Remove unstable -c lto - exeinto,doexe → into,dobin - Add test suite dependencies Closes: https://bugs.gentoo.org/show_bug.cgi?id=536992 Closes: https://bugs.gentoo.org/show_bug.cgi?id=631948 Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'app-shells/mksh')
-rw-r--r--app-shells/mksh/mksh-9999.ebuild42
1 files changed, 19 insertions, 23 deletions
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
}