repo/gentoo:master commit in: sys-cluster/charm/

commit:     52c5c734e5158d50780d69348b41f1d8b43e8025
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 07:19:37 2026 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 07:22:18 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c5c734

sys-cluster/charm: fix sed to use the right compiler

Closes: https://bugs.gentoo.org/727968
Closes: https://bugs.gentoo.org/947893
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sys-cluster/charm/charm-6.8.2.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index 0b731f6bbcd0..e9311f407aea 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 FORTRAN_STANDARD="90"
 
-inherit flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
+inherit flag-o-matic fortran-2 multiprocessing toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
 SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="charm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -26,8 +28,6 @@ REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
 	charmproduction? ( !charmdebug !charmtracing )"
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 get_opts() {
 	local CHARM_OPTS
 
@@ -81,7 +81,8 @@ src_prepare() {
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
 		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
 	sed \
-		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
+		-e "s|CMK_CF90=\$(which .*)|CMK_CF90=\$(which $(usex mpi "mpif90" "$(tc-getFC)"))|" \
+		-e "/-z \$CMK_CF90/d" \
 		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
 		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
 		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \