Bump.

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

3 files changed, 137 insertions, 5 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index d802e9be9221..210616c35cdc 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.28 2010/04/23 19:09:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.29 2010/04/24 00:00:15 dberkholz Exp $
+
+*charm-6.2.0 (24 Apr 2010)
+
+  24 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>; +charm-6.2.0.ebuild:
+  Bump.
 
   23 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>;
   charm-6.1.2-r2.ebuild:
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 1c0e06fd96fd..687fbc4a9551 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -12,14 +12,16 @@ AUX charm-fpic-gentoo.patch 963 RMD160 d725ce4085638996244db909d4b30ce0e5623bce
 AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837379f50148e2 SHA1 3a7e9e81b9f4019aad643e5fe68093f185b8229f SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d
 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
+DIST charm-6.2.0_src.tar.gz 17107602 RMD160 4188a66c26db8c5fc4929f89a5a826a8ac897dff SHA1 a74a7baf7783885bd00531d75074eb02ff35c4a9 SHA256 3ad35154be829ed5eb66b75aa50a9431a8bdf4ae502dbeabd6ec6839afbf9260
 EBUILD charm-5.9.ebuild 3823 RMD160 f0d5fa364cecfe25376fac15da49e04f8c7c824f SHA1 7a2d84be5b4720ea16164e3e00aed17f4e46c1c2 SHA256 8b7fcc0437e41b68e9f51e09fbd02b7dc4e7da5286fae0473d3bd87fc9528406
 EBUILD charm-6.1.2-r2.ebuild 3146 RMD160 0c160507c8585c88ae1ddf540782e19cd8296a81 SHA1 384572bc1637d5ed2a4bf1dd829e3c524c42f58d SHA256 c760b4459feef1988588875267c6b486b0c6fcdbdcf09ad2f507ec84cdfc3065
-MISC ChangeLog 4577 RMD160 0f2c58b3bc28c73db12af5628001686d69ce731f SHA1 b2d77bf1c5cf9ba8cf727d24a481690af4e1cdda SHA256 88f63e87fe16fecccf43bb3586b898608de9103bf0c65b101080eaadab38820d
+EBUILD charm-6.2.0.ebuild 3092 RMD160 4fb6a5b3fd8387575201c149319748aa00f5a2ca SHA1 0005fb7565a8b28259f49fd19efc7f883e950546 SHA256 68b2da7b7389de6e5d0e6ebcf5e2209bf15f1aa9039899ee13f42b7947849d17
+MISC ChangeLog 4690 RMD160 97f04ad63a9fbb3fb7582afeee44c61058dc8bc3 SHA1 354199a661aed61ab6231c136db928838af77b35 SHA256 31529fae9ff9fc0bfec3794e0c167fce77a53eb7602d0281e4dd92ca040cfca2
 MISC metadata.xml 398 RMD160 bf40832b2220f644b2d56f653a41f047d0184b85 SHA1 9782cf178225fb5944bc6612076ff81c2512c842 SHA256 bc7d0905ab52e35d45967685ef8106826e8bfaacc7a0f58ae652fdb2b863e33d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvR8HYACgkQXVaO67S1rtuD+ACcCjhfEHhOEqIhXMjHcwEH2gbR
-DuwAoI7Dh8xipU0NYit770TDd9sP6y6X
-=Smn9
+iEYEARECAAYFAkvSNJYACgkQXVaO67S1rttQ/wCeJYaV/K2+p1LWbGj+PbF3vUYD
+Of8An2Lhhgl+BUz/RUczhxw2Ay8Olepa
+=SqlZ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/charm/charm-6.2.0.ebuild b/sys-cluster/charm/charm-6.2.0.ebuild
new file mode 100644
index 000000000000..cef83d8ee83c
--- /dev/null
+++ b/sys-cluster/charm/charm-6.2.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.1 2010/04/24 00:00:15 dberkholz Exp $
+
+EAPI=2
+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"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmkopt tcp smp doc"
+
+DEPEND="doc? ( >=app-text/poppler-0.12.3-r3[utils]
+	dev-tex/latex2html
+	virtual/tex-base )"
+RDEPEND=""
+
+case ${ARCH} in
+	x86)
+		CHARM_ARCH="net-linux" ;;
+
+	amd64)
+		CHARM_ARCH="net-linux-amd64" ;;
+esac
+
+src_prepare() {
+	# 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; 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}/charm-6.1.2-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
+	# charm has a lot of .o "libs" that it requires at runtime
+	cd "${S}"/lib
+	dolib.a *.{a,o} || die "failed to install static libs"
+
+	# install shared libs
+	cd "${S}"/lib_so
+	dolib.so *.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
+}