From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5564C138334 for ; Mon, 29 Apr 2019 13:48:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE2F1E0878; Mon, 29 Apr 2019 13:48:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3A25E0878 for ; Mon, 29 Apr 2019 13:48:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE7B5342EA4 for ; Mon, 29 Apr 2019 13:48:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FBDC57E for ; Mon, 29 Apr 2019 13:48:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1556545266.6d2258d85eac24a106a262a6d12cb02b434d2f8c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/mksh/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/mksh/mksh-9999.ebuild X-VCS-Directories: app-shells/mksh/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6d2258d85eac24a106a262a6d12cb02b434d2f8c X-VCS-Branch: master Date: Mon, 29 Apr 2019 13:48:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: edfcb89f-1abe-42bb-ae18-89f192cb7d3b X-Archives-Hash: 97f0c55959218562b3525266e7bade8f commit: 6d2258d85eac24a106a262a6d12cb02b434d2f8c Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sun Mar 17 10:23:33 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Apr 29 13:41:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2258d8 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 hacktivis.me> Signed-off-by: Michał Górny gentoo.org> app-shells/mksh/mksh-9999.ebuild | 42 ++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild index 36449d037d4..3aa638fe245 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 }