small step towards a good charm ebuild

svn path=/; revision=282

4 files changed, 28 insertions, 17 deletions

diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 2e9c116..b6e9405 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,5 +1,6 @@
-AUX charm-6.1.2-charmrun.patch 451 RMD160 f4f14fb156a5a402b16855624105c5ed4948b4d3 SHA1 844aedde27d8b0a4a5f585e0e9f040692d758eb2 SHA256 c4be50f38883b6882fd58e327be28741c1c54b13b0f7e57e4b101377fa2fc247
+AUX charm-6.1.2-charmc-gentoo.patch 453 RMD160 676da77a431bc57807aae8ff8bbdf527ff5cd72e SHA1 d5dbaad467c9efe6e501076cde6fbc4744d21397 SHA256 a540b413c3c003d0c08b9b86eef07063208a91eb9b174615e2b3f077a88082c2
+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 3127 RMD160 b8a976d4b278abe8f6118845712d466099220b0e SHA1 c79951e4d715170a8924973c18a42325d1ce2901 SHA256 0161e70cef60efde6d8adb1c1f32888f7832424423034f8c40278b2b2fdd26b7
+EBUILD charm-6.1.2.ebuild 3025 RMD160 ba423972303e93dae5e9a98c7406b231c6ca2039 SHA1 673d50935798e9ba435f889034b945a3851039b5 SHA256 b5acaca9bab9038505998898df80fea9b4c36c0bf021407a986fb77d1022a28c
 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 3ddca10..81c463e 100644
--- a/sys-cluster/charm/charm-6.1.2.ebuild
+++ b/sys-cluster/charm/charm-6.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
 LICENSE="charm"
@@ -33,6 +33,11 @@ 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"
 
 	# TCP instead of default UDP for socket comunication
 	# protocol
@@ -61,8 +66,7 @@ src_unpack() {
 
 src_compile() {
 	# build charmm++ first
-pwd
-cd "${S}"
+	cd "${S}"
 	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \
 		die "Failed to build charm++"
 
@@ -74,15 +78,6 @@ cd "${S}"
 }
 
 src_install() {
-	# make charmc play well with gentoo before
-	# we move it into /usr/bin
-	einfo "Fixing paths in charmc wrapper"
-	epatch "${FILESDIR}"/${P}-charmc-gentoo.patch
-
-	cd "${S}"
-	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 \
@@ -105,7 +100,7 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES README  || die "Failed to install docs"
 
-	# install examples after fixing path to charmc
+	# install examples
 	find examples/ -name 'Makefile' | xargs sed \
 		-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
 		die "Failed to fix examples"
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..2f727c4
--- /dev/null
+++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
@@ -0,0 +1,15 @@
+--- src/scripts/charmc.orig	2009-05-30 14:04:52.387985188 -0500
++++ src/scripts/charmc	2009-05-30 14:06:01.960343004 -0500
+@@ -335,9 +335,9 @@
+ 	PROG_EXT=".exe"
+ fi
+ 
+-CHARMLIB="$CHARMBIN/../lib"
+-CHARMINC="$CHARMBIN/../include"
+-CHARMLIBSO=
++CHARMLIB="$CHARMBIN/../gentoo-libdir"
++CHARMINC="$CHARMBIN/../gentoo-include"
++CHARMLIBSO="/usr/gentoo-libdir"
+ if test -d "$CHARMBIN/../lib_so" 
+ then
+   CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd`
diff --git a/sys-cluster/charm/files/charm-6.1.2-charmrun.patch b/sys-cluster/charm/files/charm-6.1.2-charmrun.patch
index eff6c85..d677051 100644
--- a/sys-cluster/charm/files/charm-6.1.2-charmrun.patch
+++ b/sys-cluster/charm/files/charm-6.1.2-charmrun.patch
@@ -1,5 +1,5 @@
---- src/arch/net/charmrun/charmrun.c.orig	2009-05-29 21:01:16.773778549 -0500
-+++ src/arch/net/charmrun/charmrun.c	2009-05-29 21:02:38.868587242 -0500
+--- src/arch/net/charmrun/charmrun.c.orig	2009-05-30 10:37:32.676819167 -0500
++++ src/arch/net/charmrun/charmrun.c	2009-05-30 10:38:08.835027500 -0500
 @@ -1291,7 +1291,7 @@
      char *tmp=tmpnam(NULL);/*This was once /tmp/fnord*/
  #endif