From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 24 Jul 2021 02:11:45 +0100
Subject: gentoo resync : 24.07.2021

---
 sys-cluster/charm/Manifest           |  2 +-
 sys-cluster/charm/charm-6.8.2.ebuild | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'sys-cluster/charm')

diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 871ce96dc9de..c799d76d344e 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,4 +1,4 @@
 AUX charm-6.5.1-charmc-gentoo.patch 1305 BLAKE2B 21c85a455c6fbe0f0b745d6a3f9808a3d05f90a26cf0f0f9b66f8a12a34b53ffb9963512918c269506047675cbb24f7d1d2cb2ecaf986465b6c961a1df1c42a5 SHA512 994becbf0e40c0e181222a854df98e3c7b571b517a24a0548ad323ac116f146f11b7d2e6ec4f8289ffb5926dda57d92831412e9367951387d1e224208306ed03
 DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f43037203baaa035cfa863c6ca063a81c5dc275c1517feabc3517201d5e854a2b1b4b1c492ff0433f692db39a34 SHA512 903aa47706c260d35a04e6002874d197439087d6bdbd4fe65a397a02096a2e53eeb93b64c57e5983f0190ca2dcef3a9b28a3b424207c9d3eb6e820659f5e00c1
-EBUILD charm-6.8.2.ebuild 5302 BLAKE2B 717b5a82859e72567db609dd86f5433dc2555fd798f3e8f4effd94915a98fc448ac014b191f787d1c7de945901e286db63808c2cd5e8dba186819285a653eeb7 SHA512 b0b6eabc6e971cd07183650884b10e7b6af21eed3c80d8b849801b78d09293951c3f913ef52d97439e37afa0839cc4012d138ec89ddd73601305a519e2af275e
+EBUILD charm-6.8.2.ebuild 5260 BLAKE2B f18ac35aabb158e3c473a12f30f2c8371944d24d6454e3fc54d508ca1709af9f56d477a9afb066bd68bab0db29f66b8d48237d2e6c370142282b751b3d454f0b SHA512 b33b90d8cf1d21277dd89414340f290de3b5eaefb6e827c9ef36c19c6bd0d5a77c4fcc1a48ec3980fb803b6814be69bd72f138d35be27646058162c15c5c08bd
 MISC metadata.xml 1012 BLAKE2B ee284d471b4f13534787629319734afacbb998fa7ea115377281648614693fd32b7ff91775eddf292b61f267fbfb9be81397be4f37bf1b4582de8cf06bc9364a SHA512 e8fd7cfac25aa8428adbe77922140eee5621b18afa5f10d1ed0c7b14960affc3a1dc0896b7ea034001855ef3e1c1f12791cada0f959eb210ba78f1be44b89ffc
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
 }
-- 
cgit v1.2.3