commit:     4889f43448320722c9181cc1d0d252dab1187387
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Dec 26 17:04:44 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> 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 <liaoyuan <AT> 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

Reply via email to