[gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/

["Christoph Junghans" <ottxor@gentoo.org>]

commit:     7e1c560b50e5451a874278c27bc0e7c87d0534e6
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 00:01:27 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 00:01:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e1c560b

moved to gx86

---
 sys-cluster/charm/ChangeLog                        |  43 -----
 sys-cluster/charm/charm-6.5.0.ebuild               | 178 ---------------------
 .../charm/files/charm-6.5.0-charmc-gentoo.patch    |  25 ---
 sys-cluster/charm/metadata.xml                     |  12 --
 4 files changed, 258 deletions(-)

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
deleted file mode 100644
index dce9f9f..0000000
--- a/sys-cluster/charm/ChangeLog
+++ /dev/null
@@ -1,43 +0,0 @@
-# ChangeLog for sys-cluster/charm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  26 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  Beautify.
-
-  26 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,
-  metadata.xml:
-  Added new package: projections  A performance analysis framework for Charm++
-  applications
-
-  26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> charm-6.5.0.ebuild:
-  make use of usex
-
-  24 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  sys-cluster/charm-6.5.0: Reorganized DEPENDs.
-
-  24 Jun 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  sys-cluster/charm-6.5.0: Added mpi use flag.
-
-  31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  Added die to test.
-
-  31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  Added src_test().
-
-  31 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  The "-DALLOCA_H" compiler flag appears to be unnecessary...
-
-  30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild,
-  metadata.xml:
-  More cleanup. Beautify!
-
-  30 May 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.0.ebuild:
-  Added examples use flag.
-
-*charm-6.5.0 (30 May 2013)
-
-  30 May 2013; Nicolas Bock <nicolasbock@gmail.com> +charm-6.5.0.ebuild,
-  +files/charm-6.5.0-charmc-gentoo.patch, +metadata.xml:
-  Version bump to sys-cluster/charm-6.5.0.          This ebuild fixes bugs
-  471740 and 432834.

diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
deleted file mode 100644
index 9b34899..0000000
--- a/sys-cluster/charm/charm-6.5.0.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-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 mpi smp static-libs tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-	)"
-
-REQUIRED_USE="
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-src_prepare() {
-	# Build shared libraries by default.
-	CHARM_OPTS="--build-shared"
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --with-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --with-tracing --with-tracing-commthread"
-		fi
-	fi
-
-	# 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' '')"
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	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
-
-	einfo "charm opts: ${CHARM_OPTS}"
-}
-
-src_compile() {
-	# Build charmm++ first.
-	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
-		${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		cd "${S}"/doc
-		make doc || die "failed to create pdf/html docs"
-	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.
-	epatch "${FILESDIR}/charm-6.5.0-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
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  doc/pdf/*
-		# Install html.
-		docinto html
-		dohtml -r doc/html/*
-	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/files/charm-6.5.0-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch
deleted file mode 100644
index 34923e3..0000000
--- a/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/scripts/charmc.old	2013-05-30 10:18:02.261819771 -0600
-+++ src/scripts/charmc	2013-05-30 10:19:50.839661634 -0600
-@@ -361,19 +361,9 @@
- 	PROG_EXT=".exe"
- fi
- 
--CHARMLIB="$CHARMBIN/../lib"
--CHARMINC="$CHARMBIN/../include"
--CHARMLIBSO=
--if test -d "$CHARMBIN/../lib_so" 
--then
--  CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd`
--  #getting absolute path is harder than thought because of symbolic links and ..
--  #ksh needs cd -P to resolve werid symbolic links, however -P is not portable
--  #csh is ok too if it exists 
--  test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd`
--  test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"`
--  test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1
--fi
-+CHARMLIB="/usr/gentoo-libdir"
-+CHARMINC="/usr/include/gentoo-include"
-+CHARMLIBSO="/usr/gentoo-libdir"
- 
- ##############################################################################
- #

diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
deleted file mode 100644
index 0e4959d..0000000
--- a/sys-cluster/charm/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<use>
-		<flag name="charmdebug">Enable the charm debugger</flag>
-		<flag name="charmproduction">Optimize performance of Charm++ runtime</flag>
-		<flag name="charmtracing">Enable tracing support in Charm++</flag>
-		<flag name="cmkopt">Enable CMK optimisation</flag>
-		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
-	</use>
-</pkgmetadata>