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 0A4881382C5 for ; Sun, 21 Jun 2020 14:58:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50DC6E087E; Sun, 21 Jun 2020 14:58:15 +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 8FCBEE087E for ; Sun, 21 Jun 2020 14:58:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6A94634FBDD for ; Sun, 21 Jun 2020 14:58:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DE412AF for ; Sun, 21 Jun 2020 14:58:10 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1592751473.02ecef7626c6add4e6df2b96a8f8098f57cd5aff.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/elvis/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/elvis/elvis-2.2.0-r8.ebuild X-VCS-Directories: app-editors/elvis/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 02ecef7626c6add4e6df2b96a8f8098f57cd5aff X-VCS-Branch: master Date: Sun, 21 Jun 2020 14:58:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 706a0152-06c2-47db-a137-5df0db0d2a2b X-Archives-Hash: 824b8a292767f67decdb4dc91ae0059b commit: 02ecef7626c6add4e6df2b96a8f8098f57cd5aff Author: Patrice Clement gentoo org> AuthorDate: Sun Jun 21 14:44:08 2020 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sun Jun 21 14:57:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ecef76 app-editors/elvis: various fixes. * remove colons as sed delimiters. * honour CFLAGS. Closes: https://bugs.gentoo.org/710346 Closes: https://bugs.gentoo.org/722058 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrice Clement gentoo.org> app-editors/elvis/elvis-2.2.0-r8.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild index 4ac39947e0d..d5c65e2ef42 100644 --- a/app-editors/elvis/elvis-2.2.0-r8.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -40,6 +40,7 @@ PATCHES=( ) src_configure() { + export CC="$(tc-getCC)" ./configure \ --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ --prefix="${EPREFIX}"/usr \ @@ -51,7 +52,8 @@ src_configure() { # Some Makefile fixups (must happen after configure) # Use our CFLAGS - sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" + sed -e "s#^CFLAGS=\(.*\)#CFLAGS=\1 ${CFLAGS}#g;" -i Makefile || \ + die "sed 1 failed" # We'll install the man-pages ourselves sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed"