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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29050158020 for ; Mon, 26 Dec 2022 17:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ED7AE07C9; Mon, 26 Dec 2022 17:19:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F4A0E07C9 for ; Mon, 26 Dec 2022 17:19:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F35683410C3 for ; Mon, 26 Dec 2022 17:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 575FF6F2 for ; Mon, 26 Dec 2022 17:19:56 +0000 (UTC) From: "Yuan Liao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuan Liao" Message-ID: <1672074820.4889f43448320722c9181cc1d0d252dab1187387.liaoyuan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild games-emulation/dosbox-x/dosbox-x-9999.ebuild X-VCS-Directories: games-emulation/dosbox-x/ X-VCS-Committer: liaoyuan X-VCS-Committer-Name: Yuan Liao X-VCS-Revision: 4889f43448320722c9181cc1d0d252dab1187387 X-VCS-Branch: dev Date: Mon, 26 Dec 2022 17:19:56 +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: 25672498-5956-4b75-8b85-16c8a005e8cb X-Archives-Hash: a7350460b22d07ce83b5729bd7479b7c commit: 4889f43448320722c9181cc1d0d252dab1187387 Author: Yuan Liao gmail com> AuthorDate: Mon Dec 26 17:04:44 2022 +0000 Commit: Yuan Liao gmail com> CommitDate: Mon Dec 26 17:13:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4889f434 games-emulation/dosbox-x: Simplify sed script for configure.ac Signed-off-by: Yuan Liao gmail.com> games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild | 6 +++--- games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild | 6 +++--- games-emulation/dosbox-x/dosbox-x-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild index d208c6afb..d05ffb418 100644 --- a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild @@ -89,9 +89,9 @@ src_prepare() { default # https://bugs.gentoo.org/887669 - # Comment out lines touching '-O*', and avoid creating an empty - # command list as a result to not break 'if', 'for', or functions - sed -i -E -e 's/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac || + # Mask lines touching '-O*', and avoid creating an empty command + # list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/((C|CXX)FLAGS=.*-O)/: \1/' configure.ac || die "Failed to stop configure.ac from touching '-O*' compiler flags" # Patch command lines like the following in Makefile.am: diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild index 9af962aef..f489f2b6b 100644 --- a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild @@ -90,9 +90,9 @@ src_prepare() { default # https://bugs.gentoo.org/887669 - # Comment out lines touching '-O*', and avoid creating an empty - # command list as a result to not break 'if', 'for', or functions - sed -i -E -e 's/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac || + # Mask lines touching '-O*', and avoid creating an empty command + # list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/((C|CXX)FLAGS=.*-O)/: \1/' configure.ac || die "Failed to stop configure.ac from touching '-O*' compiler flags" eautoreconf diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild index 39ecd4c1c..1b813f7ff 100644 --- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild @@ -90,9 +90,9 @@ src_prepare() { default # https://bugs.gentoo.org/887669 - # Comment out lines touching '-O*', and avoid creating an empty - # command list as a result to not break 'if', 'for', or functions - sed -i -E -e 's/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac || + # Mask lines touching '-O*', and avoid creating an empty command + # list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/((C|CXX)FLAGS=.*-O)/: \1/' configure.ac || die "Failed to stop configure.ac from touching '-O*' compiler flags" eautoreconf