From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4FDD139694 for ; Thu, 27 Jul 2017 09:56:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4534F1FC045; Thu, 27 Jul 2017 09:56:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 236821FC045 for ; Thu, 27 Jul 2017 09:56:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C4C03417E5 for ; Thu, 27 Jul 2017 09:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 028E674A6 for ; Thu, 27 Jul 2017 09:56:25 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1501149373.5660e25f87eb819cebf6a88998519f657248a1a1.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/st/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/st/st-9999.ebuild X-VCS-Directories: x11-terms/st/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 5660e25f87eb819cebf6a88998519f657248a1a1 X-VCS-Branch: master Date: Thu, 27 Jul 2017 09:56:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 90c88d1b-bd11-4cd2-9b10-c40ca5983d5b X-Archives-Hash: ecddefd3476f7649f500feaac7102e60 commit: 5660e25f87eb819cebf6a88998519f657248a1a1 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jul 27 09:56:13 2017 +0000 Commit: Jeroen Roovers gentoo 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() {