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 5833E138334 for ; Mon, 18 Feb 2019 16:18:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CA29E083E; Mon, 18 Feb 2019 16:18:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 218C7E083E for ; Mon, 18 Feb 2019 16:18:26 +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 B158E335C8F for ; Mon, 18 Feb 2019 16:18:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBE1D501 for ; Mon, 18 Feb 2019 16:18:22 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1550506697.5298548230002f61f280ee6ec374ca06537d7fb6.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sysvinit/sysvinit-2.94_beta.ebuild X-VCS-Directories: sys-apps/sysvinit/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 5298548230002f61f280ee6ec374ca06537d7fb6 X-VCS-Branch: master Date: Mon, 18 Feb 2019 16:18:22 +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: d2f850cf-dd66-4d35-8eb4-40867b40c4ef X-Archives-Hash: 07eb6e265132cc311af1b10fae94c8a8 commit: 5298548230002f61f280ee6ec374ca06537d7fb6 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 18 16:17:43 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 18 16:18:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52985482 sys-apps/sysvinit: Use separate sed command for logsave removal. Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/sysvinit/sysvinit-2.94_beta.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild index c79dc75f1d4..bb9842d5c6a 100644 --- a/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild @@ -39,10 +39,9 @@ src_prepare() { sed -i '/^CPPFLAGS =$/d' src/Makefile || die # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - # logsave is already in e2fsprogs sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(last|lastb|logsave|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(last|lastb|logsave|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ + -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ src/Makefile || die # pidof has moved to >=procps-3.3.9 @@ -51,6 +50,12 @@ src_prepare() { -e '/^MAN8/s:\::g' \ src/Makefile || die + # logsave is already in e2fsprogs + sed -i -r \ + -e '/^(USR)?S?BIN/s:\::g' \ + -e '/^MAN8/s:\::g' \ + src/Makefile || die + # Mung inittab for specific architectures cd "${WORKDIR}" || die cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"