1 |
commit: 5660e25f87eb819cebf6a88998519f657248a1a1 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 27 09:56:13 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 27 09:56:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5660e25f |
7 |
|
8 |
x11-terms/st: Fix Makefile sed script (bug #626334). |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
x11-terms/st/st-9999.ebuild | 16 +++++++++------- |
13 |
1 file changed, 9 insertions(+), 7 deletions(-) |
14 |
|
15 |
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild |
16 |
index c57b598bd32..0d922620326 100644 |
17 |
--- a/x11-terms/st/st-9999.ebuild |
18 |
+++ b/x11-terms/st/st-9999.ebuild |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2016 Gentoo Foundation |
21 |
+# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
EAPI=6 |
25 |
@@ -27,20 +27,22 @@ DEPEND=" |
26 |
" |
27 |
|
28 |
src_prepare() { |
29 |
- eapply_user |
30 |
+ default |
31 |
|
32 |
- sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \ |
33 |
+ sed -i \ |
34 |
+ -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \ |
35 |
-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \ |
36 |
-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \ |
37 |
-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \ |
38 |
-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \ |
39 |
- -i config.mk || die |
40 |
- sed -e '/@echo/!s:@::' \ |
41 |
+ config.mk || die |
42 |
+ sed -i \ |
43 |
-e '/tic/d' \ |
44 |
- -i Makefile || die |
45 |
- tc-export CC |
46 |
+ Makefile || die |
47 |
|
48 |
restore_config config.h |
49 |
+ |
50 |
+ tc-export CC |
51 |
} |
52 |
|
53 |
src_install() { |