From 0fb71e0215ed52863e462cccef73c01aff44d43d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 18 Dec 2017 15:11:02 +0000
Subject: gentoo resync : 18.12.2017

---
 sys-cluster/charm/Manifest           |  2 +-
 sys-cluster/charm/charm-6.7.1.ebuild | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'sys-cluster/charm')

diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 56eb49c46357..afc2bad96aa2 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -15,5 +15,5 @@ EBUILD charm-6.5.1-r3.ebuild 5330 BLAKE2B 26314be92b5e5451476bd1611faddb7c194c1d
 EBUILD charm-6.6.0-r1.ebuild 5578 BLAKE2B 843fd7c798641276977c7ff08574d0accc749465d47cb19d798c923327e837e933d2da53f4947c868cce694deddf6ecae6a4737c4609f18aaca6b31b63981a63 SHA512 f049285b990d1627f4bdd2dc5f0bc5ae64bed61769f8a81787a6137ad8ad50ab5c0e80038d77c00a25523085e9ba36f3582217894e3b215b1f031c3a8f081567
 EBUILD charm-6.6.0.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
 EBUILD charm-6.6.1.ebuild 5781 BLAKE2B 14d474c34b72731e5c139a3f5be4de882a1f99a0a8043b4220cfa4caa37116e6c1bbeb3ed5c4079a43b328dc4233090b0932db1038039c84d645bafd606c11e1 SHA512 1c278e8e52860772ebbae872d5f172c0e69932baf8555085572d278402782d913ba647f20ef6789d26265f78272d510d5a351047df419299e322f3b0e5217474
-EBUILD charm-6.7.1.ebuild 5598 BLAKE2B 7b0aa34d514acf3868665494d5dccc9f2cf56d5db87c031bc34ab47b6d232d71211ddf97395d2ac8bb5c57a10050858f38017aa11f31fa1cc089d15c783a3bc7 SHA512 b40081a208590bda948ac87350eed55566c6548f273c0b80b16bdf5b68a5ae1fb8a46595960f0cf91c7a5c91083e159564a7cc51db5ed301dac296f77fb58f8b
+EBUILD charm-6.7.1.ebuild 5837 BLAKE2B 763e71d521c95ab06b7225f61cfb63b0f0c5fd9bf71ddec1f4653a6ad63f14dc1f9ea2382c713f0945faf20f435d1b3e07adf2b1f2e3714d0b2f103b9b968604 SHA512 9f51f10e66a46a85959042a3f3f9cf0f336b49a9ccdaf3c3cf0e7f2ca20b127123f1a5da185d79ea5ef2fa2ea0baf1de4ed43d691d3723e87b8b63938270ca7e
 MISC metadata.xml 1012 BLAKE2B ee284d471b4f13534787629319734afacbb998fa7ea115377281648614693fd32b7ff91775eddf292b61f267fbfb9be81397be4f37bf1b4582de8cf06bc9364a SHA512 e8fd7cfac25aa8428adbe77922140eee5621b18afa5f10d1ed0c7b14960affc3a1dc0896b7ea034001855ef3e1c1f12791cada0f959eb210ba78f1be44b89ffc
diff --git a/sys-cluster/charm/charm-6.7.1.ebuild b/sys-cluster/charm/charm-6.7.1.ebuild
index 1f2d2300a744..47af0637e8b4 100644
--- a/sys-cluster/charm/charm-6.7.1.ebuild
+++ b/sys-cluster/charm/charm-6.7.1.ebuild
@@ -30,7 +30,9 @@ DEPEND="
 		')
 		media-libs/netpbm
 		${PYTHON_DEPS}
-	)"
+	)
+	net-libs/libtirpc
+	"
 
 REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
@@ -73,20 +75,22 @@ get_opts() {
 }
 
 src_prepare() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+
 	sed \
-		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
-		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \
+		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
 		-e "/CMK_CF90/s:\`which f90.*$::g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS} ${CXXFLAGS}:g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS} ${CFLAGS}:g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-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)"):g" \
-		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
+		-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" \
 		-i src/arch/common/*.sh || die
 
 	sed \
@@ -97,6 +101,7 @@ src_prepare() {
 		-e "s:-o charmrun:${LDFLAGS} &:g" \
 		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
 		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-e "/^CHARMC/s:$: ${CPPFLAGS} ${CFLAGS}:g" \
 		-i \
 		src/scripts/Makefile \
 		src/util/charmrun-src/Makefile || die
-- 
cgit v1.2.3