Diff charm-6.6.1 with a charm-6.7.1

/usr/portage/sys-cluster/charm/charm-6.7.1.ebuild 2017-12-18 17:09:00.000000000 +0300
1
# Copyright 1999-2016 Gentoo Foundation
1
# Copyright 1999-2017 Gentoo Foundation
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=5
......
17 17
KEYWORDS="~amd64 ~x86"
18 18
IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi ampi numa smp static-libs syncft tcp"
19 19

  
20
REQUIRED_USE="ampi? ( !mpi )"
21

  
22 20
RDEPEND="mpi? ( virtual/mpi )"
23 21
DEPEND="
24 22
	${RDEPEND}
......
32 30
		')
33 31
		media-libs/netpbm
34 32
		${PYTHON_DEPS}
35
	)"
33
	)
34
	net-libs/libtirpc
35
	"
36 36

  
37 37
REQUIRED_USE="
38 38
	cmkopt? ( !charmdebug !charmtracing )
39 39
	charmproduction? ( !charmdebug !charmtracing )"
40 40

  
41
S="${WORKDIR}/${PN}"
42

  
43 41
pkg_setup() {
44 42
	use doc && python-any-r1_pkg_setup
45 43
}
......
77 75
}
78 76

  
79 77
src_prepare() {
78
	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
79

  
80 80
	sed \
81
		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
82
		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
81
		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \
82
		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
83 83
		-e "/CMK_CF90/s:\`which f90.*$::g" \
84
		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
85
		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
84
		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS} ${CXXFLAGS}:g" \
85
		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS} ${CFLAGS}:g" \
86 86
		-e '/CMK_F90_MODINC/s:-p:-I:g' \
87 87
		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
88 88
		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
89 89
	sed \
90
		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
91
		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
92
		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
93
		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
90
		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
91
		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
92
		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
93
		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
94 94
		-i src/arch/common/*.sh || die
95 95

  
96 96
	sed \
......
101 101
		-e "s:-o charmrun:${LDFLAGS} &:g" \
102 102
		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
103 103
		-e "s:-o charmd:${LDFLAGS} &:g" \
104
		-e "/^CHARMC/s:$: ${CPPFLAGS} ${CFLAGS}:g" \
104 105
		-i \
105 106
		src/scripts/Makefile \
106 107
		src/util/charmrun-src/Makefile || die
......
110 111

  
111 112
	# Fix QA notice. Filed report with upstream.
112 113
	append-cflags -DALLOCA_H
113

  
114
	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
115
	epatch "${FILESDIR}/charm-6.5.1-fix-markupSanitizer.patch"
116 114
}
117 115

  
118 116
src_compile() {
......
174 172
	done
175 173

  
176 174
	# Install libs incl. charm objects
177
	for i in lib*/*.{so,o,a}; do
175
	for i in lib*/*.{so,a}; do
178 176
		[[ ${i} = *.a ]] && use !static-libs && continue
179 177
		if [[ -L ${i} ]]; then
180 178
			i=$(readlink -e "${i}") || die
Thank you!