Fix CHARMLIB in charmc

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 142 insertions, 4 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index adbcb5ef7f2e..0f48a214f952 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.21 2009/06/07 06:58:26 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.22 2009/06/07 23:48:39 je_fro Exp $
+
+*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}
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index d02cdd7d5f38..f6fce694646b 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,6 +1,6 @@
 AUX charm-5.9-gcc-4.2.patch 466 RMD160 26686ecd228b9fe8d5ff7b5478b34aa2a20347ef SHA1 648f3d31f4ae5163279455a564a47bef7688b513 SHA256 6e83e80f1db4c25d70cebc8b14e76cb82fec473512e5a2b0474744e61892aa75
 AUX charm-5.9-gcc4.patch 1701 RMD160 7b28484b9f956fb310fc5f7bbbfb2c896a12081d SHA1 7478496cb6f13763b047abca700dfbee2c651c9d SHA256 5d1ccf611c8f40c4e6572fcf1bb8cae1f0339a158df7bd698efcd396c28777cc
-AUX charm-6.1.2-charmc-gentoo.patch 997 RMD160 dea765cc75495b8bcaea85a46cfdb43d2afeb110 SHA1 79277189ccc3d1611dfe55a541c26a423fef5b20 SHA256 bfb0f9e7068a0938e8fbfe8ddeb6b9a88470031bfcb7a35b6c44ec925ebf013d
+AUX charm-6.1.2-charmc-gentoo.patch 996 RMD160 9c3c009811b796330c9ec7aa6a1caceb7d9aac71 SHA1 e682a72f33aeda44b9604afb779b8c12aec52820 SHA256 1ea88dedbb161f86d298cf3bc413a544bd24a9a2babb041bf2e4ba52c2c09587
 AUX charm-6.1.2-charmrun.patch 451 RMD160 c6fbdf5fd290d5d5c0d52a8b521326f080ed646e SHA1 22a398366f8df2a37253c034afefe33566cc3105 SHA256 2e3a0279f81e76cfb5087f6c23cc0e39dff50618b0635925e373cd0c773ce603
 AUX charm-charmc-gentoo.patch 1078 RMD160 f84f49f0ced57c842f1fefe24623581b94fddde8 SHA1 c058790ccd044e5bba37ab0ac7c1f1f8b4b18acc SHA256 b903a12c4817268abf6d5797ea8cf5cfcae7ff09b969c1f073ffc08b0afbff7b
 AUX charm-doc-makefile-gentoo.patch 1348 RMD160 15941f44aad97d3f67938725d64cb94583522c73 SHA1 2c965c4d6d9390fc48f29ebae9336bab720d77bc SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03
@@ -10,6 +10,7 @@ AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837
 DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SHA1 8b34d083486e6350ddf31a71e7476d6027ef9c0f SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89
 DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a4634811dc9 SHA1 0e6cee877f22794cb647ab22ef5651048abcbbd0 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366
 EBUILD charm-5.9.ebuild 3825 RMD160 aab9026110c2eb0b4d979b8f1d5e35496be9ebb7 SHA1 2160b0bcd683cf03443f403afbb293cc144b408f SHA256 a0e46b1177cb2a916e55e0a1a8b8bcf9829900f134812a7e7303d0bc0f59166a
+EBUILD charm-6.1.2-r1.ebuild 3121 RMD160 ca654e315df97c924522a30ad2c731d4e741fbde SHA1 f81d9ae43f75bf971317675829ff85275dcda036 SHA256 ed930271fb09e2990601d4654379f6772185ccac6deda6f94c2298368215cc14
 EBUILD charm-6.1.2.ebuild 3118 RMD160 baff096ba515d1e476c77dcd3ec858e6d3ac984b SHA1 1f0670a1f1d3ad86aa537ebc4a5ef970fb9706be SHA256 8c7d9b0e7cf72fadcab7b3be2e58dd6e9b78104747d4ae3fdb8bfded00715c14
-MISC ChangeLog 3475 RMD160 ad890038686431dcb9d065def29ed97eb50f30ee SHA1 c9c876c37afaf001abd0f2656314c36198131ad1 SHA256 b5468f9e1ff9e44a86b0c7aeb15824f8e1ca6e4bd4155ff675c4c60f376055e2
+MISC ChangeLog 3645 RMD160 f6ffba346f58cbd599e572154165812e67622f49 SHA1 733f19900643c6c1f5529efc8501aa7b2dd6b112 SHA256 dcc141cf0af8997ea1f85048de9e01546f6ffd252ef9d85743b16fa1343227bb
 MISC metadata.xml 398 RMD160 bf40832b2220f644b2d56f653a41f047d0184b85 SHA1 9782cf178225fb5944bc6612076ff81c2512c842 SHA256 bc7d0905ab52e35d45967685ef8106826e8bfaacc7a0f58ae652fdb2b863e33d
diff --git a/sys-cluster/charm/charm-6.1.2-r1.ebuild b/sys-cluster/charm/charm-6.1.2-r1.ebuild
new file mode 100644
index 000000000000..3bdd614cd51a
--- /dev/null
+++ b/sys-cluster/charm/charm-6.1.2-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r1.ebuild,v 1.1 2009/06/07 23:48:39 je_fro Exp $
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+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"
+S="${WORKDIR}/${P}"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmkopt tcp smp doc"
+
+DEPEND="doc? ( app-text/poppler
+		dev-tex/latex2html
+		virtual/tex-base
+		)"
+
+RDEPEND="${DEPEND}"
+
+case ${ARCH} in
+
+	x86)
+		CHARM_ARCH="net-linux" ;;
+
+	amd64)
+		CHARM_ARCH="net-linux-amd64" ;;
+esac
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-charmrun.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 && [ "${ARCH}" != "amd64" ]; then
+	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}/${P}-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
+	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
+	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
index 4c4cfceeaa4a..02cad1354f04 100644
--- a/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
+++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
@@ -17,7 +17,7 @@
 -  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"
++CHARMLIB="/usr/gentoo-libdir"
 +CHARMINC="/usr/include/gentoo-include"
 +CHARMLIBSO="/usr/gentoo-libdir"