diff options
Diffstat (limited to 'sys-cluster/charm')
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/charm/Manifest | 21 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-5.9.ebuild | 19 | ||||
| -rw-r--r-- | sys-cluster/charm/files/charm-examples-gentoo.patch | 105 | ||||
| -rw-r--r-- | sys-cluster/charm/files/digest-charm-5.9 | 3 |
5 files changed, 134 insertions, 21 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index 43ff84efac05..4caa2763e07c 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,6 +1,11 @@ # 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.5 2006/02/28 02:58:56 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.6 2006/04/07 20:17:13 markusle Exp $ + + 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: diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest index cca668875ecd..6bab9bb316a3 100644 --- a/sys-cluster/charm/Manifest +++ b/sys-cluster/charm/Manifest @@ -1,24 +1,27 @@ -MD5 81f7f87203887e6a030861c8d69280b1 ChangeLog 1385 -RMD160 0d172f0b972f85f7eb60c533ea6bcf0b5b809fb7 ChangeLog 1385 -SHA256 2c594ec5282723eb5e944533b6101933f7ba228ee6001ad2ab3de3f84a6f1d38 ChangeLog 1385 -MD5 ef7d1f0d59ffa5a0f9a6ca819999cc31 charm-5.9.ebuild 3542 -RMD160 2e27db33d58df74ed3b7ea096f15184fe8f9ba01 charm-5.9.ebuild 3542 -SHA256 5dc72fea68e4ffa1bd064cbc1a55a54b8153e66b944b203a22a2b1809f7f73c8 charm-5.9.ebuild 3542 +MD5 081b0125ead34e6959378a5a75d5d63d ChangeLog 1610 +RMD160 627b87fb661bfd67591d12432d621c5d3d056867 ChangeLog 1610 +SHA256 571d16a81cdb34ba66d27b08087665a8833a1b1204531dec911847d1a23da811 ChangeLog 1610 +MD5 b000fd33574fd8244d3c600c2410d94e charm-5.9.ebuild 3690 +RMD160 1b304cd5dbde676bad92c7554076dc4197b544dc charm-5.9.ebuild 3690 +SHA256 f9f10dbad5a2085c1da759463f1e0827b223bca4b5bdeddf36cd8134be060b98 charm-5.9.ebuild 3690 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 RMD160 15941f44aad97d3f67938725d64cb94583522c73 files/charm-doc-makefile-gentoo.patch 1348 SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03 files/charm-doc-makefile-gentoo.patch 1348 +MD5 1cf0b881c7a8b6d73855a0a69238f6dd files/charm-examples-gentoo.patch 3920 +RMD160 d038f9e2f32db47a6f335c92dd73e727a54dd2b1 files/charm-examples-gentoo.patch 3920 +SHA256 8eafde8fc87500194bc1eda05c04fd138298e6a39785c50f4f66781a52f6c01e files/charm-examples-gentoo.patch 3920 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 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 b35dac459cbea704e977110d91e6e5c9 files/digest-charm-5.9 232 +RMD160 90d2e64226249164a5f8761598bbeda949c9ff45 files/digest-charm-5.9 232 +SHA256 6964b85e817a173c67ce749606ca0f230357a9d201cae01d21d290ca429dc96e files/digest-charm-5.9 232 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 cbdef615a479..15ed557f52b8 100644 --- a/sys-cluster/charm/charm-5.9.ebuild +++ b/sys-cluster/charm/charm-5.9.ebuild @@ -1,14 +1,13 @@ # 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.4 2006/02/28 02:58:56 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.5 2006/04/07 20:17:15 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="mirror://gentoo/${PN}-examples-gentoo.patch.bz2 - ${P}.tar.gz" +SRC_URI="${P}.tar.gz" SLOT="0" KEYWORDS="~x86" @@ -30,9 +29,7 @@ pkg_nofetch() { echo einfo "Please download ${P}.tar.gz from" einfo "${CHARM_DOWNLOAD}" - einfo "as well as ${PN}-examples-gentoo.patch.bz2" - einfo "from ${GENTOO_MIRRORS}" - einfo "and then move both to ${DISTDIR}" + einfo "and then move it to ${DISTDIR}" echo } @@ -49,7 +46,7 @@ src_unpack() { # patch the example Makefiles so they run out of # the box - epatch "${WORKDIR}"/${PN}-examples-gentoo.patch + epatch "${FILESDIR}"/${PN}-examples-gentoo.patch # enable proper detection of python in configure epatch "${FILESDIR}"/${PN}-python-configure-gentoo.patch @@ -122,7 +119,13 @@ src_install() { cd "${S}" dodoc CHANGES README || die "Failed to install docs" - # install examples + # install examples after fixing path to charmc + 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++/* 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 000000000000..ef8089f161fe --- /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/digest-charm-5.9 b/sys-cluster/charm/files/digest-charm-5.9 index 930577dc956a..2c50cfb8b99d 100644 --- a/sys-cluster/charm/files/digest-charm-5.9 +++ b/sys-cluster/charm/files/digest-charm-5.9 @@ -1,6 +1,3 @@ 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 |