public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-emulation/dosbox-x/
Date: Tue, 27 Dec 2022 08:05:52 +0000 (UTC)	[thread overview]
Message-ID: <1672074820.4889f43448320722c9181cc1d0d252dab1187387.ceamac@gentoo> (raw)

commit:     4889f43448320722c9181cc1d0d252dab1187387
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Dec 26 17:04:44 2022 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
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	other threads:[~2022-12-27  8:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-27  8:05 Viorel Munteanu [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-03 19:42 [gentoo-commits] repo/proj/guru:master commit in: games-emulation/dosbox-x/ Julien Roy
2024-12-15 18:10 Julien Roy
2024-12-15 18:10 Julien Roy
2024-12-15 18:10 Julien Roy
2024-12-15 18:10 Julien Roy
2024-10-07  9:06 David Roman
2024-10-07  9:06 David Roman
2024-07-31 22:49 Lucio Sauer
2024-04-27 12:09 Julien Roy
2024-03-02  7:10 Arthur Zamarin
2024-02-08  9:29 David Roman
2023-11-09  3:11 Haelwenn Monnier
2023-10-08 20:58 David Roman
2023-10-08 20:58 David Roman
2023-09-03 12:27 Haelwenn Monnier
2023-08-21 12:43 Haelwenn Monnier
2023-04-01 21:30 Haelwenn Monnier
2023-04-01 21:30 Haelwenn Monnier
2023-03-16  8:41 Florian Schmaus
2022-12-27  8:05 Viorel Munteanu
2022-12-27  8:05 Viorel Munteanu
2022-12-16 16:39 Florian Schmaus
2022-12-16 16:39 Florian Schmaus
2022-12-06  6:09 Viorel Munteanu
2022-10-07 13:13 Arthur Zamarin
2022-09-08  1:46 Ronny Gutbrod
2022-08-24 15:52 Ronny Gutbrod
2022-08-02 10:55 Haelwenn Monnier
2022-08-02 10:55 Haelwenn Monnier
2022-07-05  7:14 Florian Schmaus

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=1672074820.4889f43448320722c9181cc1d0d252dab1187387.ceamac@gentoo \
    --to=ceamac@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