x11-terms/st: Fix Makefile sed script (bug #626334).

Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index c57b598bd329d04fe19ef627d55c12adc61a997e..0d9226203262393abb29b07d74e96a8bf2a825e0 100644 (file)
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,20 +27,22 @@ DEPEND="
 "
 
 src_prepare() {
-       eapply_user
+       default
 
-       sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
+       sed -i \
+               -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
                -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
                -e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
                -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
                -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
-               -i config.mk || die
-       sed -e '/@echo/!s:@::' \
+               config.mk || die
+       sed -i \
                -e '/tic/d' \
-               -i Makefile || die
-       tc-export CC
+               Makefile || die
 
        restore_config config.h
+
+       tc-export CC
 }
 
 src_install() {