| 1 |
commit: 6d2258d85eac24a106a262a6d12cb02b434d2f8c |
| 2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
| 3 |
AuthorDate: Sun Mar 17 10:23:33 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 29 13:41:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2258d8 |
| 7 |
|
| 8 |
app-shells/mksh: Fix the live ebuild |
| 9 |
|
| 10 |
- mksh changed to tarballs so cpio and unpacker is now removed. |
| 11 |
- Update keywords from release ebuild |
| 12 |
- Rebuild.sh is useless for us |
| 13 |
- Bump to EAPI 7 |
| 14 |
- Remove shell updater as mksh is in baselayout |
| 15 |
- Remove unstable -c lto |
| 16 |
- exeinto,doexe → into,dobin |
| 17 |
- Add test suite dependencies |
| 18 |
|
| 19 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=536992 |
| 20 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=631948 |
| 21 |
|
| 22 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
| 23 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 24 |
|
| 25 |
app-shells/mksh/mksh-9999.ebuild | 42 ++++++++++++++++++---------------------- |
| 26 |
1 file changed, 19 insertions(+), 23 deletions(-) |
| 27 |
|
| 28 |
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild |
| 29 |
index 36449d037d4..3aa638fe245 100644 |
| 30 |
--- a/app-shells/mksh/mksh-9999.ebuild |
| 31 |
+++ b/app-shells/mksh/mksh-9999.ebuild |
| 32 |
@@ -1,9 +1,9 @@ |
| 33 |
-# Copyright 1999-2016 Gentoo Foundation |
| 34 |
+# Copyright 1999-2019 Gentoo Authors |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
-EAPI=6 |
| 38 |
+EAPI=7 |
| 39 |
|
| 40 |
-inherit eutils toolchain-funcs |
| 41 |
+inherit toolchain-funcs |
| 42 |
|
| 43 |
if [[ $PV = 9999 ]]; then |
| 44 |
inherit cvs |
| 45 |
@@ -12,45 +12,41 @@ if [[ $PV = 9999 ]]; then |
| 46 |
ECVS_USER="_anoncvs" |
| 47 |
ECVS_AUTH="ext" |
| 48 |
KEYWORDS="" |
| 49 |
- DEPEND="static? ( dev-libs/klibc )" |
| 50 |
else |
| 51 |
- inherit unpacker |
| 52 |
- DEPEND="app-arch/cpio |
| 53 |
- static? ( dev-libs/klibc )" |
| 54 |
- SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz" |
| 55 |
- KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" |
| 56 |
+ SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" |
| 57 |
+ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 58 |
fi |
| 59 |
|
| 60 |
DESCRIPTION="MirBSD Korn Shell" |
| 61 |
HOMEPAGE="http://mirbsd.de/mksh" |
| 62 |
LICENSE="BSD" |
| 63 |
SLOT="0" |
| 64 |
-IUSE="static" |
| 65 |
-RDEPEND="" |
| 66 |
+IUSE="static test" |
| 67 |
+RDEPEND="static? ( dev-libs/klibc )" |
| 68 |
+DEPEND=" |
| 69 |
+ ${RDEPEND} |
| 70 |
+ test? ( |
| 71 |
+ dev-lang/perl |
| 72 |
+ sys-apps/ed |
| 73 |
+ ) |
| 74 |
+" |
| 75 |
S="${WORKDIR}/${PN}" |
| 76 |
|
| 77 |
src_compile() { |
| 78 |
tc-export CC |
| 79 |
# we want to build static with klibc |
| 80 |
- if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi |
| 81 |
+ if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi |
| 82 |
export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" |
| 83 |
- sh Build.sh -r -c lto || sh Rebuild.sh || die |
| 84 |
+ sh Build.sh -r || die |
| 85 |
} |
| 86 |
|
| 87 |
src_install() { |
| 88 |
- exeinto /bin |
| 89 |
- doexe mksh |
| 90 |
+ into / |
| 91 |
+ dobin mksh |
| 92 |
doman mksh.1 |
| 93 |
dodoc dot.mkshrc |
| 94 |
} |
| 95 |
|
| 96 |
src_test() { |
| 97 |
- ./test.sh || die |
| 98 |
-} |
| 99 |
- |
| 100 |
-pkg_postinst() { |
| 101 |
- ebegin "Updating /etc/shells" |
| 102 |
- ( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells |
| 103 |
- mv -f "${T}"/shells "${ROOT}"etc/shells |
| 104 |
- eend $? |
| 105 |
+ ./test.sh -v || die |
| 106 |
} |
Archives