Moved large patch file to mirrors. See bug #123634.

(Portage version: 2.1_pre5-r1)

5 files changed, 36 insertions, 612 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index f0af6b4cd17c..43ff84efac05 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.4 2006/01/12 21:38:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.5 2006/02/28 02:58:56 markusle Exp $
+
+  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.
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 87b47d5da7f5..fd4a7827a4d6 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,9 +1,24 @@
-MD5 ee360f66d5ad204fab761afb9a879da9 ChangeLog 1220
-MD5 c097c3c96244b856656e07cf950a500e charm-5.9.ebuild 3492
+MD5 76eae9790df5961d96c6bc88ea09b0b4 ChangeLog 1384
+RMD160 89d6cef0a33b047fe0725e0ed5de4f22a05c09c1 ChangeLog 1384
+SHA256 5cac852de2366666ec4b2c2e254dc4d7d3b345ced0964dca781236164fa5e113 ChangeLog 1384
+MD5 0257bd61bedee4db6f92f690a571b3b6 charm-5.9.ebuild 3541
+RMD160 1f03aef0eedeb03588e473964cf162fe5281c9b5 charm-5.9.ebuild 3541
+SHA256 c90207290835b509c75a979f34d3553329410a46e1ab6ff33f4390e5cbaf4327 charm-5.9.ebuild 3541
 MD5 0b343e0d9021a96327bd9255a3ed885d files/charm-charmc-gentoo.patch 1078
+RMD160 f84f49f0ced57c842f1fefe24623581b94fddde8 files/charm-charmc-gentoo.patch 1078
+SHA256 b903a12c4817268abf6d5797ea8cf5cfcae7ff09b969c1f073ffc08b0afbff7b files/charm-charmc-gentoo.patch 1078
 MD5 6ffec6746277d139021ebb96789fbd8a files/charm-doc-makefile-gentoo.patch 1348
-MD5 33c5bf01e103e9957966f8de2dbec2a5 files/charm-examples-gentoo.patch 21815
+RMD160 15941f44aad97d3f67938725d64cb94583522c73 files/charm-doc-makefile-gentoo.patch 1348
+SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03 files/charm-doc-makefile-gentoo.patch 1348
 MD5 42f61a51a66dc7707feb2cfe1d5aca80 files/charm-fpic-gentoo.patch 963
+RMD160 d725ce4085638996244db909d4b30ce0e5623bce files/charm-fpic-gentoo.patch 963
+SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec files/charm-fpic-gentoo.patch 963
 MD5 24b09ea5cfbd4065c8fac2404401f991 files/charm-python-configure-gentoo.patch 984
-MD5 43245f7dc8f2b58f1980c467341773c4 files/digest-charm-5.9 62
+RMD160 fb7f9279e528d3e74756c734c6837379f50148e2 files/charm-python-configure-gentoo.patch 984
+SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d files/charm-python-configure-gentoo.patch 984
+MD5 a1419712054b0ae1db6b87a4589e6cb5 files/digest-charm-5.9 500
+RMD160 0459bdca02cfe27eaa4059d265c781700a6cbd7e files/digest-charm-5.9 500
+SHA256 117678d1082cea5182664b08b8c3ce2771af9ba94b4eeb29b4c3b9dc80a4609d files/digest-charm-5.9 500
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
+RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
+SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 metadata.xml 254
diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild
index 1c28be25f223..cbdef615a479 100644
--- a/sys-cluster/charm/charm-5.9.ebuild
+++ b/sys-cluster/charm/charm-5.9.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2006 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.3 2006/01/12 21:38:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.4 2006/02/28 02:58:56 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"
+SRC_URI="mirror://gentoo/${PN}-examples-gentoo.patch.bz2
+		${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~x86"
@@ -29,9 +30,9 @@ 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!"
+	einfo "as well as ${PN}-examples-gentoo.patch.bz2"
+	einfo "from ${GENTOO_MIRRORS}"
+	einfo "and then move both to ${DISTDIR}"
 	echo
 }
 
@@ -48,7 +49,7 @@ src_unpack() {
 
 	# patch the example Makefiles so they run out of
 	# the box
-	epatch "${FILESDIR}"/${PN}-examples-gentoo.patch
+	epatch "${WORKDIR}"/${PN}-examples-gentoo.patch
 
 	# enable proper detection of python in configure
 	epatch "${FILESDIR}"/${PN}-python-configure-gentoo.patch
diff --git a/sys-cluster/charm/files/charm-examples-gentoo.patch b/sys-cluster/charm/files/charm-examples-gentoo.patch
deleted file mode 100644
index daacf358dae9..000000000000
--- a/sys-cluster/charm/files/charm-examples-gentoo.patch
+++ /dev/null
@@ -1,601 +0,0 @@
-# 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/digest-charm-5.9 b/sys-cluster/charm/files/digest-charm-5.9
index 9f890aa29571..930577dc956a 100644
--- a/sys-cluster/charm/files/digest-charm-5.9
+++ b/sys-cluster/charm/files/digest-charm-5.9
@@ -1 +1,6 @@
 MD5 e0632ea7993a9b9f197fe5c20712a6be charm-5.9.tar.gz 7580639
+RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d charm-5.9.tar.gz 7580639
+SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89 charm-5.9.tar.gz 7580639
+MD5 723fa2e2a6dbc439e0003cec6c629e54 charm-examples-gentoo.patch.bz2 2762
+RMD160 f4eb9551a2355672a809a710d96aa27e75f88be3 charm-examples-gentoo.patch.bz2 2762
+SHA256 3974d7bdc3d10617e124f41c06948b33007a82b6357657a5731f0ba5f574637a charm-examples-gentoo.patch.bz2 2762