moved from sci-libs/charm to sys-cluster/charm

(Portage version: 2.0.51.22-r3)

10 files changed, 910 insertions, 0 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
new file mode 100644
index 000000000000..bfdd97925574
--- /dev/null
+++ b/sys-cluster/charm/ChangeLog
@@ -0,0 +1,21 @@
+# ChangeLog for sci-libs/charm
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.1 2005/11/10 15:11:55 markusle Exp $
+
+  10 Nov 2005; Markus Dittrich <markusle@gentoo.org>
+  +files/charm-charmc-gentoo.patch, +files/charm-doc-makefile-gentoo.patch,
+  +files/charm-examples-gentoo.patch, +files/charm-fpic-gentoo.patch,
+  +files/charm-python-configure-gentoo.patch, +metadata.xml,
+  +charm-5.9.ebuild:
+  moved from sci-libs/charm to sys-cluster/charm
+
+*charm-5.9 (05 Oct 2005)
+
+  05 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  +files/charm-charmc-gentoo.patch, +files/charm-doc-makefile-gentoo.patch,
+  +files/charm-examples-gentoo.patch, +files/charm-fpic-gentoo.patch,
+  +files/charm-python-configure-gentoo.patch, +metadata.xml,
+  +charm-5.9.ebuild:
+  Initial import. Ebuild contributed by Markus Dittrich <markusle@gmail.com>
+  (bug #108031).
+
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
new file mode 100644
index 000000000000..173beaf20837
--- /dev/null
+++ b/sys-cluster/charm/Manifest
@@ -0,0 +1,9 @@
+MD5 c897869932b267dd65e4e2d7fdb65223 charm-5.9.ebuild 3503
+MD5 c4df9d0b5b24d25dfcb5a6c77f27b981 ChangeLog 605
+MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
+MD5 43245f7dc8f2b58f1980c467341773c4 files/digest-charm-5.9 62
+MD5 0b343e0d9021a96327bd9255a3ed885d files/charm-charmc-gentoo.patch 1078
+MD5 33c5bf01e103e9957966f8de2dbec2a5 files/charm-examples-gentoo.patch 21815
+MD5 42f61a51a66dc7707feb2cfe1d5aca80 files/charm-fpic-gentoo.patch 963
+MD5 24b09ea5cfbd4065c8fac2404401f991 files/charm-python-configure-gentoo.patch 984
+MD5 6ffec6746277d139021ebb96789fbd8a files/charm-doc-makefile-gentoo.patch 1348
diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild
new file mode 100644
index 000000000000..115a17ab80f0
--- /dev/null
+++ b/sys-cluster/charm/charm-5.9.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.1 2005/11/10 15:11:55 markusle Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
+LICENSE="charm"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI="${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="cmkopt tcp smp doc icc"
+
+RESTRICT="fetch"
+
+DEPEND="icc? ( >=dev-lang/icc-8.1 )
+	doc? ( app-text/pdftohtml )
+	doc? ( dev-tex/latex2html )
+	doc? ( virtual/tetex )"
+
+CHARM_ARCH="net-linux"
+CHARM_DOWNLOAD="http://charm.cs.uiuc.edu/download/"
+
+
+pkg_nofetch() {
+	echo
+	einfo "Please download ${P}.tar.gz from"
+	einfo "${CHARM_DOWNLOAD}"
+	einfo "after agreeing to the license and then move it to "
+	einfo "${DISTDIR}"
+	einfo "Be sure to select the ${PV} version!"
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# add -fPIC to generate PIC code for charm so's
+	epatch "${FILESDIR}"/${PN}-fpic-gentoo.patch
+
+	# for pdf/html docs we need to patch the makefiles
+	if use doc; then
+		epatch "${FILESDIR}"/${PN}-doc-makefile-gentoo.patch
+	fi
+
+	# patch the example Makefiles so they run out of
+	# the box
+	epatch "${FILESDIR}"/${PN}-examples-gentoo.patch
+
+	# enable proper detection of python in configure
+	epatch "${FILESDIR}"/${PN}-python-configure-gentoo.patch
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	if use tcp; then
+		CHARM_OPTS="${CHARM_OPTS} tcp"
+	fi
+
+	# enable direct SMP support using shared memory
+	if use smp; then
+		CHARM_OPTS="${CHARM_OPTS} smp"
+	fi
+
+	# compile with icc if requested
+	if use icc; then
+		if [ $(tc-getCC) != "icc" ]; then
+			die "You cannot use $(tc-getCC) with USE='icc'"
+		fi
+		CHARM_OPTS="${CHARM_OPTS} icc"
+	fi
+
+	# CMK optimization 
+	if use cmkopt; then
+		append-flags -DCMK_OPTIMIZE=1
+	fi
+}
+
+src_compile() {
+	# build charmm++ first
+	cd "${S}"
+	./build charm++ net-linux ${CHARM_OPTS} ${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_install() {
+	cd "${S}"
+
+	# make charmc play well with gentoo before
+	# we move it into /usr/bin
+	einfo "Fixing paths in charmc wrapper"
+	epatch "${FILESDIR}"/${PN}-charmc-gentoo.patch
+
+	sed -e "s/gentoo-include/${P}/" -i ./src/scripts/charmc || \
+		die "failed patching charmc script"
+
+	# install binaries
+	cd "${S}"/bin
+	dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \
+		./conv-cpm ./dep.pl || die "Failed to install binaries"
+
+	# install headers	
+	cd "${S}"/include
+	insinto /usr/include/${P}
+	doins * || die "failed to install header files"
+
+	# install static libs
+	cd "${S}"/lib
+	dolib.a * || die "failed to install static libs"
+
+	# install shared libs
+	cd "${S}"/lib_so
+	dolib.so * || die "failed to install shared libs"
+
+	# basic docs
+	cd "${S}"
+	dodoc CHANGES README  || die "Failed to install docs"
+
+	# install examples
+	insinto /usr/share/doc/${PF}/examples
+	doins -r examples/charm++/*
+
+	# pdf/html docs
+	if use doc; then
+		cd "${S}"/doc
+		# install pdfs
+		insinto /usr/share/doc/${PF}/pdf
+		doins  doc/pdf/* || die "failed to install pdf docs"
+		# install html
+		docinto html
+		dohtml -r doc/html/* || die "failed to install html docs"
+	fi
+}
+
+pkg_postinst() {
+	echo
+	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'."
+	echo
+}
diff --git a/sys-cluster/charm/files/charm-charmc-gentoo.patch b/sys-cluster/charm/files/charm-charmc-gentoo.patch
new file mode 100644
index 000000000000..e5be49a1d068
--- /dev/null
+++ b/sys-cluster/charm/files/charm-charmc-gentoo.patch
@@ -0,0 +1,29 @@
+# adjust paths in charmc wrapper to point to the proper include
+# and libary directories
+
+--- charm-5.9/src/scripts/charmc	2005-01-25 23:13:30.000000000 +0000
++++ charm-5.9-patched/src/scripts/charmc	2005-09-26 00:52:57.000000000 +0000
+@@ -656,20 +656,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/lib"
++CHARMINC="/usr/include/gentoo-include"
++CHARMLIBSO="/usr/lib"
+ 
+ 
+ ##############################################################################
diff --git a/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch b/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch
new file mode 100644
index 000000000000..f18497ab30cd
--- /dev/null
+++ b/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch
@@ -0,0 +1,35 @@
+# patch to properly build the docs as pdf and html
+
+--- charm-5.9/doc/Makefile	2004-10-14 06:12:10.000000000 +0000
++++ charm-5.9-patched/doc/Makefile	2005-09-24 22:55:53.000000000 +0000
+@@ -1,4 +1,4 @@
+-IDIR=../../doc
++IDIR=./doc
+ LNCMD=test ! -f pplmanual.sty && ln -f -s ../pplmanual.sty .
+ RMCMD=rm -f ./pplmanual.sty
+ DIRS=install converse convext charm++ libraries f90charm pose \
+--- charm-5.9/doc/Makefile.common	2005-04-19 17:21:52.000000000 +0000
++++ charm-5.9-patched/doc/Makefile.common	2005-09-24 22:56:30.000000000 +0000
+@@ -10,7 +10,7 @@
+ # (optional) PROJECT_LINK: HTML to include at bottom of page
+ 
+ # Destination directory for local copy of files (e.g., on user machine)
+-DOCDIR=..
++DOCDIR=../doc
+ 
+ # Destination directory for web-accessible copy of files (e.g., on PPL machines)
+ WEBDIR=/www/ppl_manuals
+@@ -71,12 +71,10 @@
+ 	-rm -fr index.tex $(FIG_CLEAN)
+ 
+ # Build local copy of documentation:
+-doc: all
++doc: pdf html
+ 	if [ ! -d $(DOCDIR) ] ; then mkdir $(DOCDIR) ; fi
+-	if [ ! -d $(DOCDIR)/ps ] ; then mkdir $(DOCDIR)/ps ; fi
+ 	if [ ! -d $(DOCDIR)/pdf ] ; then mkdir $(DOCDIR)/pdf ; fi
+ 	if [ ! -d $(DOCDIR)/html ] ; then mkdir $(DOCDIR)/html ; fi
+-	/bin/cp $(FILE).ps $(DOCDIR)/ps/$(DEST).ps
+ 	/bin/cp $(FILE).pdf $(DOCDIR)/pdf/$(DEST).pdf
+ 	/bin/rm -rf $(DOCDIR)/html/$(DEST)
+ 	/bin/cp -R $(FILE) $(DOCDIR)/html/$(DEST)
diff --git a/sys-cluster/charm/files/charm-examples-gentoo.patch b/sys-cluster/charm/files/charm-examples-gentoo.patch
new file mode 100644
index 000000000000..daacf358dae9
--- /dev/null
+++ b/sys-cluster/charm/files/charm-examples-gentoo.patch
@@ -0,0 +1,601 @@
+# patch to fix the examples makefiles such that "make test" will run
+# out of the box 
+
+diff -Naur charm-5.9/examples/ampi/Cjacobi3D/Makefile charm-5.9-backup/examples/ampi/Cjacobi3D/Makefile
+--- charm-5.9/examples/ampi/Cjacobi3D/Makefile	2005-04-05 23:55:15.000000000 +0000
++++ charm-5.9-backup/examples/ampi/Cjacobi3D/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ ampi: jacobi
+ 
+diff -Naur charm-5.9/examples/ampi/alltoall/Makefile charm-5.9-backup/examples/ampi/alltoall/Makefile
+--- charm-5.9/examples/ampi/alltoall/Makefile	2005-04-01 17:02:57.000000000 +0000
++++ charm-5.9-backup/examples/ampi/alltoall/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ OPTS = -O3
+-CHARMC = ../../../bin/charmc -language ampi
++CHARMC=/usr/bin/charmc -language ampi
+ MPICC = mpicc
+ 
+ all: alltoall
+diff -Naur charm-5.9/examples/ampi/creduce/Makefile charm-5.9-backup/examples/ampi/creduce/Makefile
+--- charm-5.9/examples/ampi/creduce/Makefile	2004-10-24 05:56:26.000000000 +0000
++++ charm-5.9-backup/examples/ampi/creduce/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ ampi: test.C
+ 	$(CHARMC) -c test.C
+diff -Naur charm-5.9/examples/ampi/pingpong/Makefile charm-5.9-backup/examples/ampi/pingpong/Makefile
+--- charm-5.9/examples/ampi/pingpong/Makefile	2005-04-28 16:36:27.000000000 +0000
++++ charm-5.9-backup/examples/ampi/pingpong/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ OPTS=-O3 
+-CHARMC=../../../bin/charmc -language ampi $(OPTS)
++CHARMC=/usr/bin/charmc -language ampi $(OPTS)
+ MPICC=mpicc $(OPTS)
+ 
+ #all : pingpong-2way.c
+diff -Naur charm-5.9/examples/bigsim/emulator/Makefile charm-5.9-backup/examples/bigsim/emulator/Makefile
+--- charm-5.9/examples/bigsim/emulator/Makefile	2005-04-09 07:10:17.000000000 +0000
++++ charm-5.9-backup/examples/bigsim/emulator/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ all: jacobi3D maxReduce prime ping octo line ring
+ 	cd littleMD; $(MAKE)
+diff -Naur charm-5.9/examples/bigsim/sdag/jacobi-no-redn/Makefile charm-5.9-backup/examples/bigsim/sdag/jacobi-no-redn/Makefile
+--- charm-5.9/examples/bigsim/sdag/jacobi-no-redn/Makefile	2004-10-26 15:03:53.000000000 +0000
++++ charm-5.9-backup/examples/bigsim/sdag/jacobi-no-redn/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ OPTS=-g
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ all: jacobi
+ 
+diff -Naur charm-5.9/examples/bigsim/tools/loadlog/Makefile charm-5.9-backup/examples/bigsim/tools/loadlog/Makefile
+--- charm-5.9/examples/bigsim/tools/loadlog/Makefile	2005-05-28 06:14:38.000000000 +0000
++++ charm-5.9-backup/examples/bigsim/tools/loadlog/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ loadlog: loadlog.o
+ 	$(CHARMC) -seq -o loadlog loadlog.o -lconv-bluegene-logs -lconv-util -lblue-standalone -language c++
+diff -Naur charm-5.9/examples/charm++/RedExample/Makefile charm-5.9-backup/examples/charm++/RedExample/Makefile
+--- charm-5.9/examples/charm++/RedExample/Makefile	2004-10-24 05:55:27.000000000 +0000
++++ charm-5.9-backup/examples/charm++/RedExample/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS) $(MOPTS) 
++CHARMC=/usr/bin/charmc $(OPTS) $(MOPTS) 
+ 
+ 
+ OBJS = RedExample.o
+@@ -19,7 +19,7 @@
+ 	$(CHARMC) -c RedExample.C
+ 
+ test: all
+-	./charmrun ./RedExample 20 4.5 10.3 +p4
++	./charmrun ++local ./RedExample 20 4.5 10.3 +p4
+ 
+ bgtest: all
+-	./charmrun ./RedExample 20 4.5 10.3 +p4 +x2 +y2 +z2
++	./charmrun ++local ./RedExample 20 4.5 10.3 +p4 +x2 +y2 +z2
+diff -Naur charm-5.9/examples/charm++/hello/1darray/Makefile charm-5.9-backup/examples/charm++/hello/1darray/Makefile
+--- charm-5.9/examples/charm++/hello/1darray/Makefile	2004-10-24 05:55:27.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/1darray/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4 10
++	./charmrun ++local hello +p4 10
+ 
+ bgtest: all
+-	./charmrun hello +p4 10 +x2 +y2 +z1
++	./charmrun ++local hello +p4 10 +x2 +y2 +z1
+diff -Naur charm-5.9/examples/charm++/hello/3darray/Makefile charm-5.9-backup/examples/charm++/hello/3darray/Makefile
+--- charm-5.9/examples/charm++/hello/3darray/Makefile	2004-10-24 21:13:14.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/3darray/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4 10
++	./charmrun ++local hello +p4 10
+ 
+ bgtest: all
+-	./charmrun hello +p4 10 +x2 +y2 +z2
++	./charmrun ++local hello +p4 10 +x2 +y2 +z2
+diff -Naur charm-5.9/examples/charm++/hello/darray/Makefile charm-5.9-backup/examples/charm++/hello/darray/Makefile
+--- charm-5.9/examples/charm++/hello/darray/Makefile	2004-10-24 21:13:14.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/darray/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p2 10
++	./charmrun ++local hello +p2 10
+ 
+ bgtest: all
+-	./charmrun hello +p2 10 +x2 +y2 +z1
++	./charmrun ++local hello +p2 10 +x2 +y2 +z1
+diff -Naur charm-5.9/examples/charm++/hello/dgroup/Makefile charm-5.9-backup/examples/charm++/hello/dgroup/Makefile
+--- charm-5.9/examples/charm++/hello/dgroup/Makefile	2004-10-24 21:13:14.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/dgroup/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p2
++	./charmrun ++local hello +p2
+ 
+ bgtest: all
+-	./charmrun hello +p2 +x2 +y2 +z1
++	./charmrun ++local hello +p2 +x2 +y2 +z1
+diff -Naur charm-5.9/examples/charm++/hello/dllarray/Makefile charm-5.9-backup/examples/charm++/hello/dllarray/Makefile
+--- charm-5.9/examples/charm++/hello/dllarray/Makefile	2004-09-29 19:20:20.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/dllarray/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,4 +17,4 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4 10
++	./charmrun ++local hello +p4 10
+diff -Naur charm-5.9/examples/charm++/hello/fancyarray/Makefile charm-5.9-backup/examples/charm++/hello/fancyarray/Makefile
+--- charm-5.9/examples/charm++/hello/fancyarray/Makefile	2004-10-24 21:13:14.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/fancyarray/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4 10
++	./charmrun ++local hello +p4 10
+ 
+ bgtest: all
+-	./charmrun hello +p4 10 +x2 +y2 +z2
++	./charmrun ++local hello +p4 10 +x2 +y2 +z2
+diff -Naur charm-5.9/examples/charm++/hello/group/Makefile charm-5.9-backup/examples/charm++/hello/group/Makefile
+--- charm-5.9/examples/charm++/hello/group/Makefile	2004-10-24 21:13:15.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/group/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4 10
++	./charmrun ++local hello +p4 10
+ 
+ bgtest: all
+-	./charmrun hello +p4 10 +x2 +y2 +z2
++	./charmrun ++local hello +p4 10 +x2 +y2 +z2
+diff -Naur charm-5.9/examples/charm++/hello/sdag/Makefile charm-5.9-backup/examples/charm++/hello/sdag/Makefile
+--- charm-5.9/examples/charm++/hello/sdag/Makefile	2004-10-24 21:13:15.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/sdag/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4
++	./charmrun ++local hello +p4
+ 
+ bgtest: all
+-	./charmrun hello +p4 +x2 +y2 +z2
++	./charmrun ++local hello +p4 +x2 +y2 +z2
+diff -Naur charm-5.9/examples/charm++/hello/stl_array/Makefile charm-5.9-backup/examples/charm++/hello/stl_array/Makefile
+--- charm-5.9/examples/charm++/hello/stl_array/Makefile	2004-10-24 21:13:15.000000000 +0000
++++ charm-5.9-backup/examples/charm++/hello/stl_array/Makefile	2005-09-27 03:27:25.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ OBJS = hello.o
+ 
+@@ -17,7 +17,7 @@
+ 	$(CHARMC) -c hello.C
+ 
+ test: all
+-	./charmrun hello +p4 10
++	./charmrun ++local hello +p4 10
+ 
+ bgtest: all
+-	./charmrun hello +p4 10 +x2 +y2 +z2
++	./charmrun ++local hello +p4 10 +x2 +y2 +z2
+diff -Naur charm-5.9/examples/charm++/integrate/Makefile charm-5.9-backup/examples/charm++/integrate/Makefile
+--- charm-5.9/examples/charm++/integrate/Makefile	2004-10-24 05:55:27.000000000 +0000
++++ charm-5.9-backup/examples/charm++/integrate/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm: pgm.o
+ 	$(CHARMC) pgm.o  -o pgm -language charm++
+@@ -10,7 +10,7 @@
+ 	rm -f pgm *.o conv-host *.decl.h *.def.h *~ charmrun
+ 
+ test: pgm
+-	./charmrun pgm +p4 100 5
++	./charmrun ++local pgm +p4 100 5
+ 
+ bgtest: pgm
+-	./charmrun pgm +p4 100 5 +x2 +y2 +z1
++	./charmrun ++local pgm +p4 100 5 +x2 +y2 +z1
+diff -Naur charm-5.9/examples/charm++/integrate2/Makefile charm-5.9-backup/examples/charm++/integrate2/Makefile
+--- charm-5.9/examples/charm++/integrate2/Makefile	2004-11-23 05:58:52.000000000 +0000
++++ charm-5.9-backup/examples/charm++/integrate2/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm: pgm.o
+ 	$(CHARMC) pgm.o  -o pgm -language charm++
+@@ -13,8 +13,8 @@
+ 	rm -f pgm *.o conv-host *.decl.h *.def.h *~ charmrun
+ 
+ test: pgm
+-	./charmrun ./pgm +p2 1000 10
++	./charmrun ++local ./pgm +p2 1000 10
+ 
+ bgtest: pgm
+-	./charmrun ./pgm +p2 1000 10 +x2 +y2 +z1
++	./charmrun ++local ./pgm +p2 1000 10 +x2 +y2 +z1
+ 
+diff -Naur charm-5.9/examples/charm++/integrateArray/Makefile charm-5.9-backup/examples/charm++/integrateArray/Makefile
+--- charm-5.9/examples/charm++/integrateArray/Makefile	2005-02-07 19:39:19.000000000 +0000
++++ charm-5.9-backup/examples/charm++/integrateArray/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,15 +1,15 @@
+ # modify the path of CHARMC
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm: pgm.o
+ 	$(CHARMC) pgm.o  -o pgm -language charm++
+ 
+ 
+ test: pgm
+-	./charmrun +p4 pgm 1000000 100
++	./charmrun ++local +p4 pgm 1000000 100
+ 
+ bgtest: pgm
+-	./charmrun +p4 pgm 1000000 100 +x2 +y2 +z2
++	./charmrun ++local +p4 pgm 1000000 100 +x2 +y2 +z2
+ 
+ 
+ # compile program with trace projections - performance trace library
+diff -Naur charm-5.9/examples/charm++/piArray/Makefile charm-5.9-backup/examples/charm++/piArray/Makefile
+--- charm-5.9/examples/charm++/piArray/Makefile	2005-02-07 19:39:19.000000000 +0000
++++ charm-5.9-backup/examples/charm++/piArray/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,13 +1,13 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm: pgm.o
+ 	$(CHARMC) pgm.o  -o pgm -language charm++
+ 
+ test: pgm
+-	./charmrun +p4 pgm 100000 100
++	./charmrun ++local +p4 pgm 100000 100
+ 
+ bgtest: pgm
+-	./charmrun +p4 pgm 100000 100 +x2 +y2 +z1
++	./charmrun ++local +p4 pgm 100000 100 +x2 +y2 +z1
+ 
+ pgm.o : pgm.C pgm.h pgm.decl.h
+ 	$(CHARMC) -c pgm.C
+diff -Naur charm-5.9/examples/charm++/queens/Makefile charm-5.9-backup/examples/charm++/queens/Makefile
+--- charm-5.9/examples/charm++/queens/Makefile	2004-10-24 05:55:27.000000000 +0000
++++ charm-5.9-backup/examples/charm++/queens/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm:   counter.o pgm.o
+ 	$(CHARMC) counter.o pgm.o -o pgm -language charm++ 
+@@ -25,8 +25,8 @@
+ 
+ 
+ test: pgm
+-	./charmrun ./pgm +p4 10 7
++	./charmrun ++local ./pgm +p4 10 7
+ 
+ bgtest: pgm
+-	./charmrun ./pgm +p4 10 7 +x2 +y2 +z2
++	./charmrun ++local ./pgm +p4 10 7 +x2 +y2 +z2
+ 
+diff -Naur charm-5.9/examples/charm++/ring/Makefile charm-5.9-backup/examples/charm++/ring/Makefile
+--- charm-5.9/examples/charm++/ring/Makefile	2004-10-24 06:07:28.000000000 +0000
++++ charm-5.9-backup/examples/charm++/ring/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm:  ring.o
+ 	$(CHARMC) ring.o  -o pgm -language charm++
+@@ -7,10 +7,10 @@
+ 	$(CHARMC) -c ring.ci ring.C
+ 
+ test: pgm
+-	./charmrun +p4 pgm
++	./charmrun ++local +p4 pgm
+ 
+ bgtest: pgm
+-	./charmrun +p4 pgm +x2 +y2 +z2
++	./charmrun ++local +p4 pgm +x2 +y2 +z2
+ 
+ clean:
+ 	rm -f conv-host pgm *.def.h *.decl.h *.o *~ charmrun
+diff -Naur charm-5.9/examples/charm++/rings/Makefile charm-5.9-backup/examples/charm++/rings/Makefile
+--- charm-5.9/examples/charm++/rings/Makefile	2004-10-24 06:07:28.000000000 +0000
++++ charm-5.9-backup/examples/charm++/rings/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm:  rings.o
+ 	$(CHARMC) rings.o  -o pgm -language charm++
+@@ -7,10 +7,10 @@
+ 	$(CHARMC) -c rings.ci rings.C
+ 
+ test: pgm
+-	./charmrun +p4 pgm
++	./charmrun ++local +p4 pgm
+ 
+ bgtest: pgm
+-	./charmrun +p4 pgm +x2 +y2 +z2
++	./charmrun ++local +p4 pgm +x2 +y2 +z2
+ 
+ clean:
+ 	rm -f conv-host pgm *.o *.decl.h *.def.h *~ charmrun
+diff -Naur charm-5.9/examples/charm++/speeds/Makefile charm-5.9-backup/examples/charm++/speeds/Makefile
+--- charm-5.9/examples/charm++/speeds/Makefile	2004-10-24 06:07:29.000000000 +0000
++++ charm-5.9-backup/examples/charm++/speeds/Makefile	2005-09-27 03:27:21.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pgm:  speed.o
+ 	$(CHARMC) speed.o  -o pgm -language charm++
+@@ -7,10 +7,10 @@
+ 	$(CHARMC) -c speed.ci speed.C
+ 
+ test: pgm
+-	./charmrun +p4 pgm 8
++	./charmrun ++local +p4 pgm 8
+ 
+ bgtest: pgm
+-	./charmrun +p4 pgm 8 +x2 +y2 +z1
++	./charmrun ++local +p4 pgm 8 +x2 +y2 +z1
+ 
+ clean:
+ 	rm -f conv-host pgm *.def.h *.decl.h *.o *~ charmrun
+diff -Naur charm-5.9/examples/converse/ccstest/Makefile charm-5.9-backup/examples/converse/ccstest/Makefile
+--- charm-5.9/examples/converse/ccstest/Makefile	2005-02-02 17:03:16.000000000 +0000
++++ charm-5.9-backup/examples/converse/ccstest/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,5 +1,4 @@
+-CHARMDIR=../../..
+-CHARMC=$(CHARMDIR)/bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ all: server client
+ 
+@@ -7,13 +6,13 @@
+ 	$(CHARMC) -o $@ server.o -language converse++ 
+ 
+ client: client.o
+-	g++ -o $@ client.o -I$(CHARMDIR)/include -L$(CHARMDIR)/lib -lccs-client
++	g++ -o $@ client.o -I/usr/include/charm-5.9 -L/usr/lib -lccs-client
+ 
+ server.o: server.C
+ 	$(CHARMC) -c server.C -language converse++
+ 
+ client.o: client.C
+-	g++ -c client.C -I$(CHARMDIR)/include
++	g++ -c client.C -I/usr/include/charm-5.9
+ 
+ clean:
+ 	rm -f client server *.o conv-host charmrun
+diff -Naur charm-5.9/examples/converse/pingpong/Makefile charm-5.9-backup/examples/converse/pingpong/Makefile
+--- charm-5.9/examples/converse/pingpong/Makefile	2003-08-03 04:24:46.000000000 +0000
++++ charm-5.9-backup/examples/converse/pingpong/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ 
+ pingpong: pingpong.o
+ 	$(CHARMC) -language converse++ -o pingpong pingpong.o
+diff -Naur charm-5.9/examples/fem/crack2D/Makefile charm-5.9-backup/examples/fem/crack2D/Makefile
+--- charm-5.9/examples/fem/crack2D/Makefile	2004-10-24 05:59:12.000000000 +0000
++++ charm-5.9-backup/examples/fem/crack2D/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS)
++CHARMC=/usr/bin/charmc $(OPTS)
+ COMMON_OBJS=	config.o mesh.o node.o \
+ 	lst_NL.o lst_coh2.o
+ FEM_OBJS=fem_main.o fem_mesh.o $(COMMON_OBJS)
+diff -Naur charm-5.9/examples/fem/matrix/Makefile charm-5.9-backup/examples/fem/matrix/Makefile
+--- charm-5.9/examples/fem/matrix/Makefile	2004-10-24 05:59:12.000000000 +0000
++++ charm-5.9-backup/examples/fem/matrix/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS) 
++CHARMC=/usr/bin/charmc $(OPTS) 
+ 
+ all: pgm 
+ 
+diff -Naur charm-5.9/examples/fem/simple2D/Makefile charm-5.9-backup/examples/fem/simple2D/Makefile
+--- charm-5.9/examples/fem/simple2D/Makefile	2004-10-24 05:54:33.000000000 +0000
++++ charm-5.9-backup/examples/fem/simple2D/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-CHARMC=../../../bin/charmc $(OPTS) 
++CHARMC=/usr/bin/charmc $(OPTS) 
+ 
+ all: pgm
+ 
+diff -Naur charm-5.9/examples/multiphaseSharedArrays/Makefile_common charm-5.9-backup/examples/multiphaseSharedArrays/Makefile_common
+--- charm-5.9/examples/multiphaseSharedArrays/Makefile_common	2004-10-13 02:58:08.000000000 +0000
++++ charm-5.9-backup/examples/multiphaseSharedArrays/Makefile_common	2005-09-27 03:27:08.000000000 +0000
+@@ -3,7 +3,7 @@
+ 
+ OPTS=
+ CDIR=../../../..
+-CHARMC=$(CDIR)/bin/charmc -language charm++ $(OPTS)
++CHARMC=/usr/bin/charmc -language charm++ $(OPTS)
+ 
+ # Rules to convert .ci to .decl.h and .def.h
+ .SUFFIXES:
+diff -Naur charm-5.9/examples/pose/ASIM/Makefile charm-5.9-backup/examples/pose/ASIM/Makefile
+--- charm-5.9/examples/pose/ASIM/Makefile	2004-10-22 04:38:26.000000000 +0000
++++ charm-5.9-backup/examples/pose/ASIM/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -12,8 +12,8 @@
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
+ 
+ CHARMBASE=../../..
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin
++CHARMINC=/usr/include/charm-5.9
+ 
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
+ 
+diff -Naur charm-5.9/examples/pose/BigNetSim/Makefile charm-5.9-backup/examples/pose/BigNetSim/Makefile
+--- charm-5.9/examples/pose/BigNetSim/Makefile	2004-10-17 22:48:10.000000000 +0000
++++ charm-5.9-backup/examples/pose/BigNetSim/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -16,8 +16,8 @@
+ 
+ CHARMBASE=../../../
+ #CHARMBASE=/expand8/home/gzheng/old/charm-6-8/net-linux/
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin
++CHARMINC=/usr/include/charm-5.9
+ 
+ ifeq ($(SEQUENTIAL),1)
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS) -DSEQUENTIAL_POSE=1
+diff -Naur charm-5.9/examples/pose/ChunkSim/Makefile charm-5.9-backup/examples/pose/ChunkSim/Makefile
+--- charm-5.9/examples/pose/ChunkSim/Makefile	2004-10-12 17:12:26.000000000 +0000
++++ charm-5.9-backup/examples/pose/ChunkSim/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -12,8 +12,8 @@
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
+ 
+ CHARMBASE=../../../
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin
++CHARMINC=/usr/include/charm-5.9
+ 
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
+ 
+@@ -109,4 +109,4 @@
+ 	$(CHARMBIN)/etrans.pl Worker
+ 
+ test:
+-	./pgm 1000 10 1 RANDOM SPARSE 50 -gf 344
+\ No newline at end of file
++	./pgm 1000 10 1 RANDOM SPARSE 50 -gf 344
+diff -Naur charm-5.9/examples/pose/HiSim/Makefile.common charm-5.9-backup/examples/pose/HiSim/Makefile.common
+--- charm-5.9/examples/pose/HiSim/Makefile.common	2004-11-02 07:29:40.000000000 +0000
++++ charm-5.9-backup/examples/pose/HiSim/Makefile.common	2005-09-27 03:27:08.000000000 +0000
+@@ -1,8 +1,8 @@
+ 
+ CHARMBASE=../../../../
+ #CHARMBASE=/expand8/home/gzheng/tmp/pose/charm/net-linux
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin
++CHARMINC=/usr/include/charm-5.9
+ ETRANS=$(CHARMBIN)/etrans.pl
+ OPTS=-g
+ 
+diff -Naur charm-5.9/examples/pose/LBSim/Makefile charm-5.9-backup/examples/pose/LBSim/Makefile
+--- charm-5.9/examples/pose/LBSim/Makefile	2004-11-04 04:30:45.000000000 +0000
++++ charm-5.9-backup/examples/pose/LBSim/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -12,8 +12,8 @@
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
+ 
+ CHARMBASE=../../../
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin
++CHARMINC=/usr/include/charm-5.9
+ 
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
+ 
+diff -Naur charm-5.9/examples/pose/Ring/Makefile charm-5.9-backup/examples/pose/Ring/Makefile
+--- charm-5.9/examples/pose/Ring/Makefile	2005-02-08 18:58:05.000000000 +0000
++++ charm-5.9-backup/examples/pose/Ring/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -12,8 +12,8 @@
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
+ 
+ CHARMBASE=../../..
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin/
++CHARMINC=/usr/include/charm-5.9
+ 
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
+ 
+diff -Naur charm-5.9/examples/pose/SimBenchmark/Makefile charm-5.9-backup/examples/pose/SimBenchmark/Makefile
+--- charm-5.9/examples/pose/SimBenchmark/Makefile	2005-03-17 22:31:41.000000000 +0000
++++ charm-5.9-backup/examples/pose/SimBenchmark/Makefile	2005-09-27 03:27:08.000000000 +0000
+@@ -12,8 +12,8 @@
+ OPTS=-O#-DCMK_OPTIMIZE=1 -DCMK_MEMCHECKS_OFF=1
+ 
+ CHARMBASE=../../..
+-CHARMBIN=$(CHARMBASE)/bin
+-CHARMINC=$(CHARMBASE)/include
++CHARMBIN=/usr/bin
++CHARMINC=/usr/include/charm-5.9
+ 
+ CHARMC=$(CHARMBIN)/charmc -I$(CHARMINC)/pose $(OPTS)
+ 
diff --git a/sys-cluster/charm/files/charm-fpic-gentoo.patch b/sys-cluster/charm/files/charm-fpic-gentoo.patch
new file mode 100644
index 000000000000..e70874de9daa
--- /dev/null
+++ b/sys-cluster/charm/files/charm-fpic-gentoo.patch
@@ -0,0 +1,32 @@
+# compile with -fPIC to avoid TEXTRELs
+
+--- charm-5.9/src/arch/net-linux/conv-mach.sh	2005-04-22 01:14:55.000000000 +0000
++++ charm-5.9-backup/src/arch/net-linux/conv-mach.sh	2005-09-27 18:07:10.000000000 +0000
+@@ -1,8 +1,8 @@
+ CMK_CPP_CHARM="/lib/cpp -P"
+ CMK_CPP_C="gcc -E"
+-CMK_CC="gcc "
+-CMK_CXX="g++ "
+-CMK_CXXPP="$CMK_CXX -x c++ -E "
++CMK_CC="gcc -fPIC"
++CMK_CXX="g++ -fPIC -Wno-deprecated"
++CMK_CXXPP="$CMK_CXX -E "
+ CMK_CF77="g77 "
+ CMK_CF90="f90 "
+ CMK_CF90_FIXED="$CMK_CF90 -W132 "
+@@ -10,12 +10,12 @@
+ CMK_LIBS="-lckqt"
+ #CMK_LD="$CMK_CC -Wl,--allow-multiple-definition "
+ #CMK_LDXX="$CMK_CXX -Wl,--allow-multiple-definition "
+-CMK_LD="$CMK_CC "
+-CMK_LDXX="$CMK_CXX "
++CMK_LD="gcc "
++CMK_LDXX="g++ "
+ CMK_LD_SHARED="-shared"
+ CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
+ CMK_XIOPTS=""
+-CMK_F90LIBS="-L/usr/absoft/lib -L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math "
++CMK_F90LIBS=""
+ CMK_F77LIBS="-lg2c "
+ CMK_MOD_NAME_ALLCAPS=1
+ CMK_MOD_EXT="mod"
diff --git a/sys-cluster/charm/files/charm-python-configure-gentoo.patch b/sys-cluster/charm/files/charm-python-configure-gentoo.patch
new file mode 100644
index 000000000000..6e98642aafe1
--- /dev/null
+++ b/sys-cluster/charm/files/charm-python-configure-gentoo.patch
@@ -0,0 +1,29 @@
+# include proper python headers 
+
+--- charm-5.9/src/scripts/configure	2005-06-01 03:46:06.000000000 +0000
++++ charm-5.9-backup/src/scripts/configure	2005-09-27 14:28:48.000000000 +0000
+@@ -1970,11 +1970,12 @@
+ fi
+ 
+ #### test if Python headers are installed ####
++PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}`
+ cat > $t <<EOT
+-#include "python/Python.h"
+-#include "python/compile.h"
+-#include "python/eval.h"
+-#include "python/node.h"
++#include "python${PYTHON_VERSION}/Python.h"
++#include "python${PYTHON_VERSION}/compile.h"
++#include "python${PYTHON_VERSION}/eval.h"
++#include "python${PYTHON_VERSION}/node.h"
+ 
+ int main() {
+     Py_Initialize();
+@@ -1983,7 +1984,6 @@
+     PyCodeObject *program = PyNode_Compile(programNode, "");
+ }
+ EOT
+-PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}`
+ test_link "whether Python is installed" "yes" "no" "-lpython$PYTHON_VERSION -lpthread -lutil -ldl"
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/sys-cluster/charm/files/digest-charm-5.9 b/sys-cluster/charm/files/digest-charm-5.9
new file mode 100644
index 000000000000..9f890aa29571
--- /dev/null
+++ b/sys-cluster/charm/files/digest-charm-5.9
@@ -0,0 +1 @@
+MD5 e0632ea7993a9b9f197fe5c20712a6be charm-5.9.tar.gz 7580639
diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
new file mode 100644
index 000000000000..d369d068ffb8
--- /dev/null
+++ b/sys-cluster/charm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+</pkgmetadata>