commit: 5298548230002f61f280ee6ec374ca06537d7fb6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 16:17:43 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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:\<pidof.8\>::g' \
src/Makefile || die
+ # logsave is already in e2fsprogs
+ sed -i -r \
+ -e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+ -e '/^MAN8/s:\<logsave.8\>::g' \
+ src/Makefile || die
+
# Mung inittab for specific architectures
cd "${WORKDIR}" || die
cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
