summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2021-07-21 16:49:56 +0100
committerMarek Szuba <marecki@gentoo.org>2021-07-21 16:53:37 +0100
commit62e67cad5e675b2c7f492d1f4507555d3fa9f997 (patch)
treec47c80c47757d19bde6bf1d9b4fea3a202cc6dbc /sys-cluster/charm
parentprofiles/arch/riscv: unmask Ruby (diff)
downloadgentoo-62e67cad5e675b2c7f492d1f4507555d3fa9f997.tar.gz
gentoo-62e67cad5e675b2c7f492d1f4507555d3fa9f997.tar.bz2
gentoo-62e67cad5e675b2c7f492d1f4507555d3fa9f997.zip
sys-cluster/charm: update EAPI 5 -> 8
Fails to compile for exactly the same reason as the EAPI-5 variant (Bug #782622). Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sys-cluster/charm')
-rw-r--r--sys-cluster/charm/charm-6.8.2.ebuild22
1 files changed, 10 insertions, 12 deletions
diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index c11f5157ca9d..1ff82273b8c5 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
FORTRAN_STANDARD="90"
-inherit epatch flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
+inherit flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
DESCRIPTION="Message-passing parallel language and runtime system"
HOMEPAGE="http://charm.cs.uiuc.edu/"
@@ -19,9 +19,8 @@ IUSE="charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi nu
RDEPEND="mpi? ( virtual/mpi )"
DEPEND="
${RDEPEND}
- net-libs/libtirpc
- virtual/pkgconfig
-"
+ net-libs/libtirpc"
+BDEPEND="virtual/pkgconfig"
REQUIRED_USE="
cmkopt? ( !charmdebug !charmtracing )
@@ -98,6 +97,8 @@ src_prepare() {
# Fix QA notice. Filed report with upstream.
append-cflags -DALLOCA_H
+
+ eapply_user
}
src_compile() {
@@ -124,7 +125,7 @@ src_install() {
# Make charmc play well with gentoo before we move it into /usr/bin. This
# patch cannot be applied during src_prepare() because the charmc wrapper
# is used during building.
- epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
+ eapply "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
sed -e "s|gentoo-include|${P}|" \
-e "s|gentoo-libdir|$(get_libdir)|g" \
@@ -160,12 +161,9 @@ src_install() {
i=$(readlink -e "${i}") || die
fi
[[ -s $i ]] || continue
- [[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}"
+ [[ ${i} = *.so ]] && dolib.so "${i}" || dolib.a "${i}"
done
- # Basic docs.
- dodoc CHANGES README
-
# Install examples.
if use examples; then
find examples/ -name 'Makefile' | xargs sed \
@@ -174,8 +172,8 @@ src_install() {
find examples/ -name 'Makefile' | xargs sed \
-r "s:./charmrun:./charmrun ++local:" -i || \
die "Failed to fix examples"
- insinto /usr/share/doc/${PF}/examples
- doins -r examples/charm++/*
+ docinto examples
+ dodoc -r examples/charm++/*
docompress -x /usr/share/doc/${PF}/examples
fi
}