[gentoo-commits] repo/gentoo:master commit in: app-shells/mksh/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/mksh/
Date: Mon, 29 Apr 2019 13:48:10 +0000 (UTC)	[thread overview]
Message-ID: <1556545266.6d2258d85eac24a106a262a6d12cb02b434d2f8c.mgorny@gentoo> (raw)

commit:     6d2258d85eac24a106a262a6d12cb02b434d2f8c
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sun Mar 17 10:23:33 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <contact <AT> hacktivis.me>
Signed-off-by: Michał Górny <mgorny <AT> 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
 }

next             reply	other threads:[~2019-04-29 13:48 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-29 13:48 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-18 17:54 [gentoo-commits] repo/gentoo:master commit in: app-shells/mksh/ Ulrich Müller
2024-08-30 15:58 Arthur Zamarin
2022-12-27 19:45 Sam James
2022-12-16 21:19 Arthur Zamarin
2022-12-02 18:44 WANG Xuerui
2021-05-24  7:39 Joonas Niilola
2021-04-27 20:18 Sam James
2021-02-22 14:47 Joonas Niilola
2021-02-16 12:34 Sam James
2021-02-14  5:37 Sam James
2021-02-09 21:31 Sam James
2021-02-09 21:30 Sam James
2021-02-09  9:48 Sam James
2021-02-09  6:16 Sam James
2020-12-17 13:48 Joonas Niilola
2020-12-16 16:12 Sam James
2020-12-16  8:29 Joonas Niilola
2020-12-15 10:39 Sam James
2020-12-15 10:37 Sam James
2020-12-13  7:42 Sam James
2020-12-11  7:42 Sergei Trofimovich
2020-12-10 21:41 Thomas Deutschmann
2020-12-10 17:43 Sam James
2020-05-07 14:57 Lars Wendler
2020-05-07 14:57 Lars Wendler
2020-04-07 10:21 Mart Raudsepp
2020-03-29 14:45 Sergei Trofimovich
2020-03-27 16:48 Lars Wendler
2020-03-27 16:48 Lars Wendler
2020-02-11 14:14 Michał Górny
2020-02-11 12:15 Agostino Sarubbo
2020-02-11 11:36 Agostino Sarubbo
2020-02-11 10:54 Agostino Sarubbo
2019-12-01 23:24 Michał Górny
2019-04-29 13:48 Michał Górny
2019-04-29 13:48 Michał Górny
2019-03-14 17:59 Patrick Lauer
2019-01-27 11:05 Pacho Ramos
2019-01-11 20:33 Hanno Boeck
2018-12-12 16:17 Mikle Kolyada
2018-12-08  9:36 Sergei Trofimovich
2018-12-07  2:41 Thomas Deutschmann
2018-12-05 15:23 Lars Wendler
2018-12-05 15:12 Mikle Kolyada
2018-01-16 16:02 Patrick Lauer
2018-01-07 12:39 Markus Meier
2017-08-30 18:34 Patrick Lauer
2017-08-09 14:06 Patrick Lauer
2016-08-23 14:23 Patrick Lauer
2016-08-23 14:23 Patrick Lauer
2016-07-07  2:35 Stephen Klimaszewski
2016-03-06 23:33 Patrick Lauer
2016-01-22 11:00 Patrick Lauer
2016-01-22 10:59 Patrick Lauer
2015-12-21 10:23 Patrick Lauer
2015-09-20  9:30 Agostino Sarubbo
2015-09-06 13:25 Agostino Sarubbo
2015-09-01 12:08 Lars Wendler
2015-08-26 11:00 Agostino Sarubbo

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:36449d037d dfblob:3aa638fe24 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-shells/mksh/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1556545266.6d2258d85eac24a106a262a6d12cb02b434d2f8c.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox