Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

3 files changed, 417 insertions, 0 deletions

diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index c69eed73e01a..61fa0ba44f09 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -10,6 +10,8 @@ DIST charm-6.6.0.tar.gz 18779545 BLAKE2B 7fef3e34060e6e76d757b432646da25d0869600
 DIST charm-6.6.1.tar.gz 125697465 BLAKE2B 49cdab682ddb2c5409007f852b9d2d905921a5db04aaa7a4d679f9cf05f754864be5b2c885c070d8c7f35a78584055e38993397430617f6aebfe398d415df6c4 SHA512 139409fff76ac9811b2efe6605579a877738f873b112d4e4da25f079598f6c238cf76e677ed3cf3f92aa59f29710feea3e96e59e6010e186e4191dfa4c3ef92e
 DIST charm-6.7.1.tar.gz 18843211 BLAKE2B 090959b5dd8642fecf6dff7bf24212a42b39d7940c264a0b37af9c2ae8f1ac32f3c65d22a67cdc78b7cd821523dc01659293c84e9b26fa69669915d9c5b3f4db SHA512 08581ad58ea737bb118ad1d382feeae2cec2ec0fd8ea1a227e2cb8080c40ba0d043de6c867de0dfa470b2291638b1b6bf6d52c89b4e4b6c9f1fdd824ac601436
 DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f43037203baaa035cfa863c6ca063a81c5dc275c1517feabc3517201d5e854a2b1b4b1c492ff0433f692db39a34 SHA512 903aa47706c260d35a04e6002874d197439087d6bdbd4fe65a397a02096a2e53eeb93b64c57e5983f0190ca2dcef3a9b28a3b424207c9d3eb6e820659f5e00c1
+EBUILD charm-6.5.1-r1.ebuild 5248 BLAKE2B ed7c807ce8425c6371648696bde5d7d34ce3f864f5374d580837d129cd9904f5a372793015e90b3a30ad974305d6b310eb712abe1307334e09752f1cc0d88e91 SHA512 bca23f56b551d6fb40328f8bdd25130c34f84e6b1e11236749703a0fdedbdfe40b566f13f8e3cbe07c7668582ddd0bbe880242955516c1dfdc5075571be0a573
+EBUILD charm-6.5.1-r2.ebuild 5311 BLAKE2B 194e6a685d68a3240d21352e212a9aa062ec6c26029d84c5f3384646a2203471ecadea0da6ee2cdfc5e859e0575682dad294c82770899602bd0767ad3ea14785 SHA512 8cbea2a9aeab22ffbee26659991c8caed1b8545985df91e82375995b044a18be2dc3a14183260342eb7665c81bfce83e7d04f59346b718ef9aafd1f07d7c13ae
 EBUILD charm-6.5.1-r3.ebuild 5330 BLAKE2B 26314be92b5e5451476bd1611faddb7c194c1d53f5793aec9ef0272996596ad7f94767eec677de9f7391d8fe38b049414dd93a9332763e1bc540aea5ab76aed9 SHA512 d31c2c5eca23229b208ec9e043b5e8b23e86341cbc24ab2b588d84a094c9f543ff63c4b8fc24a11eb4c4d55db7ad66917dc620b275ce5dd137276a6cbcb649cb
 EBUILD charm-6.6.0-r1.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
 EBUILD charm-6.6.0.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
new file mode 100644
index 000000000000..4f82e15a3eba
--- /dev/null
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
+
+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"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-libs/netpbm
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	doc? ( ${PYTHON_REQUIRED_USE} )
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+FORTRAN_STANDARD="90"
+
+get_opts() {
+	local CHARM_OPTS
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
+	CHARM_OPTS+="$(usex syncft ' syncft' '')"
+
+	# Build shared libraries by default.
+	CHARM_OPTS+=" --build-shared"
+
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --enable-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
+		fi
+	fi
+
+	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+	echo $CHARM_OPTS
+}
+
+src_prepare() {
+	sed \
+		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):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_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/arch/net/charmrun/Makefile || die
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	# Fix QA notice. Filed report with upstream.
+	append-cflags -DALLOCA_H
+
+	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
+	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
+}
+
+src_compile() {
+	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
+
+	# Build charmm++ first.
+	einfo "running ./build charm++ ${mybuildoptions}"
+	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
+
+	# make pdf/html docs
+	if use doc; then
+		python-single-r1_pkg_setup
+		python_fix_shebang "${S}/doc"
+		einfo "forcing ${EPYTHON}"
+		emake -j1 -C doc/charm++
+	fi
+}
+
+src_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+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"
+
+	sed -e "s|gentoo-include|${P}|" \
+		-e "s|gentoo-libdir|$(get_libdir)|g" \
+		-e "s|VERSION|${P}/VERSION|" \
+		-i ./src/scripts/charmc || die "failed patching charmc script"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		find examples/ -name 'Makefile' | xargs sed \
+			-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
+			die "Failed to fix examples"
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}/doc/charm++"
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  *.pdf
+		# Install html.
+		docinto html
+		dohtml -r manual/*
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please test your charm installation by copying the"
+	einfo "content of /usr/share/doc/${PF}/examples to a"
+	einfo "temporary location and run 'make test'."
+}
diff --git a/sys-cluster/charm/charm-6.5.1-r2.ebuild b/sys-cluster/charm/charm-6.5.1-r2.ebuild
new file mode 100644
index 000000000000..b66af8c38b24
--- /dev/null
+++ b/sys-cluster/charm/charm-6.5.1-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
+
+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"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-libs/netpbm
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	doc? ( ${PYTHON_REQUIRED_USE} )
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+FORTRAN_STANDARD="90"
+
+get_opts() {
+	local CHARM_OPTS
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
+	CHARM_OPTS+="$(usex syncft ' syncft' '')"
+
+	# Build shared libraries by default.
+	CHARM_OPTS+=" --build-shared"
+
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --enable-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
+		fi
+	fi
+
+	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
+	echo $CHARM_OPTS
+}
+
+src_prepare() {
+	sed \
+		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):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_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/arch/net/charmrun/Makefile || die
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	# Fix QA notice. Filed report with upstream.
+	append-cflags -DALLOCA_H
+
+	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
+	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
+	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
+	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
+}
+
+src_compile() {
+	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
+
+	# Build charmm++ first.
+	einfo "running ./build charm++ ${mybuildoptions}"
+	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
+
+	# make pdf/html docs
+	if use doc; then
+		python-single-r1_pkg_setup
+		python_fix_shebang "${S}/doc"
+		einfo "forcing ${EPYTHON}"
+		emake -j1 -C doc/charm++
+	fi
+}
+
+src_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+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"
+
+	sed -e "s|gentoo-include|${P}|" \
+		-e "s|gentoo-libdir|$(get_libdir)|g" \
+		-e "s|VERSION|${P}/VERSION|" \
+		-i ./src/scripts/charmc || die "failed patching charmc script"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		find examples/ -name 'Makefile' | xargs sed \
+			-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
+			die "Failed to fix examples"
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}/doc/charm++"
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  *.pdf
+		# Install html.
+		docinto html
+		dohtml -r manual/*
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please test your charm installation by copying the"
+	einfo "content of /usr/share/doc/${PF}/examples to a"
+	einfo "temporary location and run 'make test'."
+}