[gentoo-commits] repo/gentoo:master commit in: x11-terms/st/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/st/
Date: Thu, 27 Jul 2017 09:56:25 +0000 (UTC)	[thread overview]
Message-ID: <1501149373.5660e25f87eb819cebf6a88998519f657248a1a1.jer@gentoo> (raw)

commit:     5660e25f87eb819cebf6a88998519f657248a1a1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 09:56:13 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 09:56:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5660e25f

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

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 x11-terms/st/st-9999.ebuild | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index c57b598bd32..0d922620326 100644
--- 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() {

next             reply	other threads:[~2017-07-27  9:56 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-27  9:56 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-01 18:57 [gentoo-commits] repo/gentoo:master commit in: x11-terms/st/ Petr Vaněk
2025-10-01 18:57 Petr Vaněk
2024-07-29  8:54 Arthur Zamarin
2024-07-29  8:43 Arthur Zamarin
2024-07-29  6:00 Joonas Niilola
2024-07-29  6:00 Joonas Niilola
2024-05-05  8:33 Petr Vaněk
2024-05-05  8:33 Petr Vaněk
2024-05-05  8:33 Petr Vaněk
2024-02-09 13:04 Joonas Niilola
2023-01-26 17:52 Arthur Zamarin
2023-01-26 17:52 Arthur Zamarin
2023-01-26 17:52 Arthur Zamarin
2023-01-26 17:52 Arthur Zamarin
2022-10-11 17:15 Arthur Zamarin
2022-10-10 23:36 Sam James
2022-10-10 22:06 Sam James
2022-10-10 22:06 Sam James
2022-10-07 19:09 Georgy Yakovlev
2022-10-07 19:09 Georgy Yakovlev
2022-01-09 22:38 Georgy Yakovlev
2022-01-09 22:38 Georgy Yakovlev
2022-01-09  9:30 James Le Cuirot
2022-01-08 10:29 Georgy Yakovlev
2022-01-08 10:29 Georgy Yakovlev
2022-01-07 20:44 Georgy Yakovlev
2022-01-07 20:44 Georgy Yakovlev
2021-10-14 17:24 Sam James
2021-10-14 17:24 Sam James
2021-09-21 13:41 Yixun Lan
2021-07-17 23:18 Sam James
2021-07-15 21:42 Sam James
2020-11-03 21:55 Georgy Yakovlev
2020-06-30 12:54 Jeroen Roovers
2020-06-30 12:54 Jeroen Roovers
2020-06-19 10:33 Jeroen Roovers
2020-04-27 12:42 Jeroen Roovers
2019-12-31  1:12 Georgy Yakovlev
2019-08-07  7:25 Jeroen Roovers
2019-08-07  7:25 Jeroen Roovers
2019-03-29 11:49 Jeroen Roovers
2019-02-09 12:39 Jeroen Roovers
2018-09-15  8:36 Jeroen Roovers
2018-09-15  8:36 Jeroen Roovers
2018-06-04 19:25 Mart Raudsepp
2018-03-23 15:09 Jeroen Roovers
2018-03-16 20:22 Jeroen Roovers
2018-03-16 15:27 Jeroen Roovers
2017-12-18 16:52 Michael Weber
2017-09-10 21:47 Jeroen Roovers
2017-08-31 10:33 Jeroen Roovers
2017-03-30 16:37 Jeroen Roovers
2017-03-30 16:37 Jeroen Roovers
2016-08-20 14:05 Jeroen Roovers
2016-08-20 13:55 Jeroen Roovers
2016-08-20 13:55 Jeroen Roovers
2016-08-20 13:53 Jeroen Roovers
2016-08-20 10:53 Jeroen Roovers
2016-08-20  8:46 Jeroen Roovers
2015-08-27  8:34 Jeroen Roovers
2015-08-14 11:47 Jeroen Roovers
2015-08-14 11:43 Jeroen Roovers

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c57b598bd3 dfblob:0d92262032 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: x11-terms/st/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1501149373.5660e25f87eb819cebf6a88998519f657248a1a1.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox