From 08ddea362e3182aa58dda18e7d1c0efa408f696c Mon Sep 17 00:00:00 2001
From: Jeffrey Gardner <je_fro@gentoo.org>
Date: Sun, 31 May 2009 20:04:52 +0000
Subject: latest charm for testing

svn path=/; revision=283
---
 sys-cluster/charm/Manifest                              |  4 ++--
 sys-cluster/charm/charm-6.1.2.ebuild                    | 14 ++++++++++----
 sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch |  9 ++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index b6e9405..21fe926 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,6 +1,6 @@
-AUX charm-6.1.2-charmc-gentoo.patch 453 RMD160 676da77a431bc57807aae8ff8bbdf527ff5cd72e SHA1 d5dbaad467c9efe6e501076cde6fbc4744d21397 SHA256 a540b413c3c003d0c08b9b86eef07063208a91eb9b174615e2b3f077a88082c2
+AUX charm-6.1.2-charmc-gentoo.patch 413 RMD160 237b3206be5c853c18edc1a2c714133ab940fabc SHA1 34605470feb48f2809d7ba5b188487df88bcac77 SHA256 1885e4f6ed64ee2323114aa8c54aa20465be3c4e4f37a5cbc2bbc04a7677b675
 AUX charm-6.1.2-charmrun.patch 451 RMD160 c6fbdf5fd290d5d5c0d52a8b521326f080ed646e SHA1 22a398366f8df2a37253c034afefe33566cc3105 SHA256 2e3a0279f81e76cfb5087f6c23cc0e39dff50618b0635925e373cd0c773ce603
 AUX charm-9999-charmc-gentoo.patch 963 RMD160 0f6001288cc8e9fa2d471c0d7cb9395d6fcd6399 SHA1 a68f5edab5da468a425dd8f17956c48ad0f85676 SHA256 b46d982eb9244d9e97cf7a48afd320e84788a060beddfa86b13be18547e93138
 DIST charm_src.tar.gz 23903605 RMD160 6a4ec1e725001073903de0241f23c7e53cdb5e97 SHA1 0443fe79a4d7f489c227316a50927ed9c71685d5 SHA256 d30a6d069d334760fcf919d1f6dba3ac76b64336fe7570e43f91af8de5b21839
-EBUILD charm-6.1.2.ebuild 3025 RMD160 ba423972303e93dae5e9a98c7406b231c6ca2039 SHA1 673d50935798e9ba435f889034b945a3851039b5 SHA256 b5acaca9bab9038505998898df80fea9b4c36c0bf021407a986fb77d1022a28c
+EBUILD charm-6.1.2.ebuild 3122 RMD160 4ea0c7fce425c5a454b635b8c91fccced7e56603 SHA1 296fb11c6e3c795fa4f0984a2338d7d7a4bb9d96 SHA256 008d757d14032b48563137c5fa24df36df710ee8866316d494029ff00aff8f1f
 EBUILD charm-9999.ebuild 3335 RMD160 1dfce9d798191fe74bb5a04e9ba7bb3fddc7210f SHA1 4154bbb0eac565832074f6f03c526eb04afe5d00 SHA256 c75770a17900a6553339335fdeb63e72e409ef3f4eeab77f4ba18b41f1a66f09
diff --git a/sys-cluster/charm/charm-6.1.2.ebuild b/sys-cluster/charm/charm-6.1.2.ebuild
index 81c463e..0864319 100644
--- a/sys-cluster/charm/charm-6.1.2.ebuild
+++ b/sys-cluster/charm/charm-6.1.2.ebuild
@@ -32,12 +32,13 @@ esac
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}/${P}-charmrun.patch"
 	epatch "${FILESDIR}/${P}-charmc-gentoo.patch"
 
-#	sed -e "s|gentoo-include|${P}|" \
-#		-e "s|gentoo-libdir|$(get_libdir)|g" \
-#		-i ./src/scripts/charmc || die "failed patching charmc script"
+	sed -e "s|gentoo-include|${P}|" \
+		-e "s|gentoo-libdir|$(get_libdir)|g" \
+		-i ./src/scripts/charmc || die "failed patching charmc script"
 
 	# TCP instead of default UDP for socket comunication
 	# protocol
@@ -46,7 +47,8 @@ src_unpack() {
 	fi
 
 	# enable direct SMP support using shared memory
-	if [ use smp ] && [ -x ${ARCH} != amd64 ]; then
+#	if use smp && [ "${ARCH}" != "amd64" ]; then
+	if use smp; then
 		CHARM_OPTS="${CHARM_OPTS} smp"
 	fi
 
@@ -56,12 +58,16 @@ src_unpack() {
 			die "You cannot use $(tc-getCC) with USE='icc'"
 		fi
 		CHARM_OPTS="${CHARM_OPTS} icc"
+	else
+		CHARM_OPTS="${CHARM_OPTS} gcc gfortran"
 	fi
 
 	# CMK optimization
 	if use cmkopt; then
 		append-flags -DCMK_OPTIMIZE=1
 	fi
+
+	echo "charm opts: ${CHARM_OPTS}"
 }
 
 src_compile() {
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 2f727c4..f869ecf 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
@@ -1,14 +1,13 @@
---- src/scripts/charmc.orig	2009-05-30 14:04:52.387985188 -0500
-+++ src/scripts/charmc	2009-05-30 14:06:01.960343004 -0500
+--- src/scripts/charmc.orig	2009-05-31 14:35:11.998681697 -0500
++++ src/scripts/charmc	2009-05-31 14:36:35.833571993 -0500
 @@ -335,9 +335,9 @@
  	PROG_EXT=".exe"
  fi
  
 -CHARMLIB="$CHARMBIN/../lib"
--CHARMINC="$CHARMBIN/../include"
--CHARMLIBSO=
 +CHARMLIB="$CHARMBIN/../gentoo-libdir"
-+CHARMINC="$CHARMBIN/../gentoo-include"
+ CHARMINC="$CHARMBIN/../include"
+-CHARMLIBSO=
 +CHARMLIBSO="/usr/gentoo-libdir"
  if test -d "$CHARMBIN/../lib_so" 
  then
-- 
cgit v1.2.3-65-gdbad