sys-apps/sysvinit: Use separate sed command for logsave removal.
authorLars Wendler <polynomial-c@gentoo.org>
Mon, 18 Feb 2019 16:17:43 +0000 (17:17 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Mon, 18 Feb 2019 16:18:17 +0000 (17:18 +0100)
Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
sys-apps/sysvinit/sysvinit-2.94_beta.ebuild

index c79dc75f1d49d684a033cd6352aba51db5dcba9a..bb9842d5c6a981abd558c39a36e4de955b8932e8 100644 (file)
@@ -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"