aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2011-07-30 14:17:18 -0500
committerDonnie Berkholz <dberkholz@gentoo.org>2011-07-30 14:17:18 -0500
commit234d5dff9855caf48add7bb90ac2d45755ce0c83 (patch)
treef999e8718d93d4379c7d840985a5c495ad0bd49e
parentxf86-video-intel: add the latest prerelease. (diff)
downloaddberkholz-234d5dff9855caf48add7bb90ac2d45755ce0c83.tar.gz
dberkholz-234d5dff9855caf48add7bb90ac2d45755ce0c83.tar.bz2
dberkholz-234d5dff9855caf48add7bb90ac2d45755ce0c83.zip
sys-cluster/charm: bump to 6.2.1
-rw-r--r--sys-cluster/charm/ChangeLog124
-rw-r--r--sys-cluster/charm/Manifest9
-rw-r--r--sys-cluster/charm/charm-6.2.1.ebuild128
-rw-r--r--sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch25
-rw-r--r--sys-cluster/charm/files/charm-doc-makefile-gentoo.patch35
-rw-r--r--sys-cluster/charm/files/charm-examples-gentoo.patch105
-rw-r--r--sys-cluster/charm/files/charm-fpic-gentoo.patch32
-rw-r--r--sys-cluster/charm/files/charm-python-configure-gentoo.patch29
-rw-r--r--sys-cluster/charm/metadata.xml9
9 files changed, 496 insertions, 0 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
new file mode 100644
index 0000000..6dbcd5f
--- /dev/null
+++ b/sys-cluster/charm/ChangeLog
@@ -0,0 +1,124 @@
+# ChangeLog for sys-cluster/charm
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.30 2011/07/20 17:04:58 pacho Exp $
+
+ 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Drop maintainer due retirement, bug #105599
+
+*charm-6.2.0 (24 Apr 2010)
+
+ 24 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>; +charm-6.2.0.ebuild:
+ Bump.
+
+ 23 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>;
+ charm-6.1.2-r2.ebuild:
+ Fix a typo in src/scripts/Makefile -- bigsim_ooc.h, not bigism_ooc.h.
+
+ 10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> charm-6.1.2-r2.ebuild:
+ Fix poppler depend.
+
+ 27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> charm-6.1.2-r2.ebuild,
+ files/charm-6.1.2-charmc-gentoo.patch:
+ Fix patch again
+
+ 27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> -charm-6.1.2.ebuild,
+ -charm-6.1.2-r1.ebuild, files/charm-6.1.2-charmc-gentoo.patch:
+ Cleanup and fix charm-6.1.2-charmc-gentoo.patch
+
+*charm-6.1.2-r2 (27 Nov 2009)
+
+ 27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> +charm-6.1.2-r2.ebuild:
+ Fix up some no-no's in the ebuild thanks to flameeyes in bug #294463.
+
+ 31 Aug 2009; Peter Alfredsen <loki_val@gentoo.org> charm-6.1.2.ebuild,
+ charm-6.1.2-r1.ebuild:
+ Again update dependencies w.r.t. bug 264230, fully-split-out poppler
+ transition.
+
+*charm-6.1.2-r1 (07 Jun 2009)
+
+ 07 Jun 2009; Jeff Gardner <je_fro@gentoo.org> +charm-6.1.2-r1.ebuild,
+ files/charm-6.1.2-charmc-gentoo.patch:
+ Fix CHARMLIB in charmc
+
+ 07 Jun 2009; Jeff Gardner <je_fro@gentoo.org> charm-6.1.2.ebuild:
+ Fix ${S}
+
+*charm-6.1.2 (01 Jun 2009)
+
+ 01 Jun 2009; Jeff Gardner <je_fro@gentoo.org> +charm-6.1.2.ebuild,
+ +files/charm-6.1.2-charmc-gentoo.patch, +files/charm-6.1.2-charmrun.patch,
+ metadata.xml:
+ Latest version.
+
+ 30 May 2009; Ulrich Mueller <ulm@gentoo.org> charm-5.9.ebuild:
+ Remove app-text/tetex from dependencies, bug 227443.
+
+ 30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> charm-5.9.ebuild:
+ Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
+
+ 17 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
+ smp USE-flag is global now
+
+ 28 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml:
+ Update metadata.xml to include USE flag descriptions. Entries taken from
+ profiles/use.local.desc
+
+ 18 May 2008; Markus Dittrich <markusle@gentoo.org> charm-5.9.ebuild:
+ Added missing dependency on texlive-genericrecommended.
+
+ 18 May 2008; Markus Dittrich <markusle@gentoo.org> charm-5.9.ebuild:
+ Switched virtual/tetex -> virtual/latex-base (see bug #222501).
+
+ 06 Apr 2008; Markus Dittrich <markusle@gentoo.org> charm-5.9.ebuild:
+ Removed ifc use flag (see bug #97929).
+
+ 22 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+ +files/charm-5.9-gcc-4.2.patch, charm-5.9.ebuild:
+ Added patch to fix compile problem with gcc-4.2.
+
+ 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> Manifest:
+ Transition to Manifest2.
+
+ 23 May 2006; Robin H. Johnson <robbat2@gentoo.org> charm-5.9.ebuild:
+ Change to poppler for building docs, pdftohtml is deprecated in Gentoo.
+
+ 21 Apr 2006; Markus Dittrich <markusle@gentoo.org>
+ +files/charm-5.9-gcc4.patch, charm-5.9.ebuild:
+ Added patch to fix compile problems with gcc-4.1. Thanks much to
+ Brady Catherman <bradyc@uidaho.edu> for his help with debugging.
+ This fixes bug #130374.
+
+ 07 Apr 2006; Markus Dittrich <markusle@gentoo.org>
+ +files/charm-examples-gentoo.patch, charm-5.9.ebuild:
+ Re-added an optimized version of the charm-examples-gentoo.patch
+ since it keeps disappearing from the mirrors.
+
+ 28 Feb 2006; Markus Dittrich <markusle@gentoo.org>
+ -files/charm-examples-gentoo.patch, charm-5.9.ebuild:
+ Moved large patch file to mirrors. See bug #123634.
+
+ 12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> charm-5.9.ebuild:
+ app-text/poppler also provides pdftohtml.
+
+ 22 Dec 2005; Markus Dittrich <markusle@gentoo.org> metadata.xml:
+ removed from package.mask and marked as ~x86. Changed maintainer to
+ <markusle@gentoo.org>.
+
+ 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 0000000..a030758
--- /dev/null
+++ b/sys-cluster/charm/Manifest
@@ -0,0 +1,9 @@
+AUX charm-6.1.2-charmc-gentoo.patch 983 RMD160 531733244e1ef563435f97ee0b476f4bb896f750 SHA1 952220bb0d7699616e99d1913ae7ab14693d6357 SHA256 a512effc73e6e7d8c9e5ae3877d41496960207803b71dcb58c4c06ddb5ce6520
+AUX charm-doc-makefile-gentoo.patch 1348 RMD160 15941f44aad97d3f67938725d64cb94583522c73 SHA1 2c965c4d6d9390fc48f29ebae9336bab720d77bc SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03
+AUX charm-examples-gentoo.patch 3920 RMD160 d038f9e2f32db47a6f335c92dd73e727a54dd2b1 SHA1 574e3d55561b5c549e4190804eeec0f5a7a08f71 SHA256 8eafde8fc87500194bc1eda05c04fd138298e6a39785c50f4f66781a52f6c01e
+AUX charm-fpic-gentoo.patch 963 RMD160 d725ce4085638996244db909d4b30ce0e5623bce SHA1 02e80605505bf1aa3ec371643b165f3890ba0cc1 SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec
+AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837379f50148e2 SHA1 3a7e9e81b9f4019aad643e5fe68093f185b8229f SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d
+DIST charm-6.2.1_src.tar.gz 44531283 RMD160 3a04dc78fcf9a551fcf0d69c967e43171b30ebb5 SHA1 b9a8e225c74a329f53689663693b1305fc90b99d SHA256 2538d9354e7f965322674a45d293aee0633db3ed0e2d0c66f09305c48ff7d46c
+EBUILD charm-6.2.1.ebuild 3134 RMD160 fafbd55cf2e566e683e6735177791087dc251429 SHA1 7c18610890d968894de7fb9d9369befff76d2e24 SHA256 912e20f57dcfdad06b886bb19372ac64f310d2b26bcdf7848663d48cdec74c0a
+MISC ChangeLog 4793 RMD160 f741e49eae6384273b8ef38adbbd0bccdf6f0586 SHA1 a4ad663d0a0ae55f654e7cf8d5731acd933d3cdb SHA256 b551f4ea9b8cf37e095fcfca28b68bf1e1e1ef7bd3428bbb85d44dfb7c05d3b6
+MISC metadata.xml 301 RMD160 33178161cd82fc0f8c9c0c017af2e8e6479b7468 SHA1 d2436d58e768a8021223feab7729bc60a00d05e8 SHA256 8a9f74607266454c78f94120ed3f5d81ab8d01c72b54b8532521cf8742db1cb8
diff --git a/sys-cluster/charm/charm-6.2.1.ebuild b/sys-cluster/charm/charm-6.2.1.ebuild
new file mode 100644
index 0000000..d98b59c
--- /dev/null
+++ b/sys-cluster/charm/charm-6.2.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.1 2010/04/24 00:00:15 dberkholz Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+MY_P=${PN}-${PV%.*}
+DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
+LICENSE="charm"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmkopt tcp smp doc"
+
+DEPEND="doc? ( >=app-text/poppler-0.12.3-r3[utils]
+ dev-tex/latex2html
+ virtual/tex-base )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+case ${ARCH} in
+ x86)
+ CHARM_ARCH="net-linux" ;;
+
+ amd64)
+ CHARM_ARCH="net-linux-amd64" ;;
+esac
+
+src_prepare() {
+ # 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
+
+ # CMK optimization
+ if use cmkopt; then
+ append-flags -DCMK_OPTIMIZE=1
+ fi
+
+ echo "charm opts: ${CHARM_OPTS}"
+}
+
+src_compile() {
+ # build charmm++ first
+ cd "${S}"
+ ./build charm++ ${CHARM_ARCH} ${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() {
+ # make charmc play well with gentoo before
+ # we move it into /usr/bin
+ epatch "${FILESDIR}/charm-6.1.2-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"
+
+ # 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
+ # charm has a lot of .o "libs" that it requires at runtime
+ cd "${S}"/lib
+ dolib.a *.{a,o} || die "failed to install static libs"
+
+ # install shared libs
+ cd "${S}"/lib_so
+ dolib.so *.so* || die "failed to install shared libs"
+
+ # basic docs
+ cd "${S}"
+ dodoc CHANGES README || die "Failed to install docs"
+
+ # install examples
+ 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++/*
+
+ # 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-6.1.2-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
new file mode 100644
index 0000000..e381a7e
--- /dev/null
+++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
@@ -0,0 +1,25 @@
+--- src/scripts/charmc 2009-11-27 02:24:30.648381166 -0600
++++ src/scripts/charmc.new 2009-11-27 02:31:06.150618002 -0600
+@@ -343,19 +343,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/files/charm-doc-makefile-gentoo.patch b/sys-cluster/charm/files/charm-doc-makefile-gentoo.patch
new file mode 100644
index 0000000..f18497a
--- /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 0000000..ef8089f
--- /dev/null
+++ b/sys-cluster/charm/files/charm-examples-gentoo.patch
@@ -0,0 +1,105 @@
+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 0000000..e70874d
--- /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 0000000..6e98642
--- /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/metadata.xml b/sys-cluster/charm/metadata.xml
new file mode 100644
index 0000000..be41516
--- /dev/null
+++ b/sys-cluster/charm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <use>
+ <flag name='cmkopt'>Enable CMK optimisation</flag>
+ <flag name='tcp'>Use TCP (instead of UPD) for socket communication</flag>
+ </use>
+</pkgmetadata>