version bump (bug #432834)

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 221 insertions, 27 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index b50ae919843b..ec5ebb5d3deb 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/charm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.33 2012/07/01 14:12:34 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.34 2013/06/26 23:58:38 ottxor Exp $
+
+*charm-6.5.0 (26 Jun 2013)
+
+  26 Jun 2013; Christoph Junghans <ottxor@gentoo.org> +charm-6.5.0.ebuild,
+  metadata.xml:
+  version bump (bug #432834)
 
   01 Jul 2012; Justin Lecher <jlec@gentoo.org> charm-6.2.0.ebuild,
   +files/charm-6.2.0-gcc-4.7.patch:
@@ -132,4 +138,3 @@
   +charm-5.9.ebuild:
   Initial import. Ebuild contributed by Markus Dittrich <markusle@gmail.com>
   (bug #108031).
-
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 80c6b5ef4caa..eb9d06642a78 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,29 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX charm-5.9-gcc-4.2.patch 466 RMD160 26686ecd228b9fe8d5ff7b5478b34aa2a20347ef SHA1 648f3d31f4ae5163279455a564a47bef7688b513 SHA256 6e83e80f1db4c25d70cebc8b14e76cb82fec473512e5a2b0474744e61892aa75
-AUX charm-5.9-gcc4.patch 1701 RMD160 7b28484b9f956fb310fc5f7bbbfb2c896a12081d SHA1 7478496cb6f13763b047abca700dfbee2c651c9d SHA256 5d1ccf611c8f40c4e6572fcf1bb8cae1f0339a158df7bd698efcd396c28777cc
-AUX charm-6.1.2-charmc-gentoo.patch 983 RMD160 531733244e1ef563435f97ee0b476f4bb896f750 SHA1 952220bb0d7699616e99d1913ae7ab14693d6357 SHA256 a512effc73e6e7d8c9e5ae3877d41496960207803b71dcb58c4c06ddb5ce6520
-AUX charm-6.1.2-charmrun.patch 451 RMD160 c6fbdf5fd290d5d5c0d52a8b521326f080ed646e SHA1 22a398366f8df2a37253c034afefe33566cc3105 SHA256 2e3a0279f81e76cfb5087f6c23cc0e39dff50618b0635925e373cd0c773ce603
-AUX charm-6.2.0-gcc-4.7.patch 1642 RMD160 88e8d4554a58bfd47fb4d3fc45c2adf7ebaae265 SHA1 558a8264fb11f594c56a9b7a8a553069ee433e58 SHA256 a6dfa6db3b5c420492d19e2cd1dfc8b5b86d7b7cd1e5bf40d8b03954ee9d3fb0
-AUX charm-charmc-gentoo.patch 1078 RMD160 f84f49f0ced57c842f1fefe24623581b94fddde8 SHA1 c058790ccd044e5bba37ab0ac7c1f1f8b4b18acc SHA256 b903a12c4817268abf6d5797ea8cf5cfcae7ff09b969c1f073ffc08b0afbff7b
-AUX charm-doc-makefile-gentoo.patch 1348 RMD160 15941f44aad97d3f67938725d64cb94583522c73 SHA1 2c965c4d6d9390fc48f29ebae9336bab720d77bc SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03
-AUX charm-examples-gentoo.patch 3920 RMD160 d038f9e2f32db47a6f335c92dd73e727a54dd2b1 SHA1 574e3d55561b5c549e4190804eeec0f5a7a08f71 SHA256 8eafde8fc87500194bc1eda05c04fd138298e6a39785c50f4f66781a52f6c01e
-AUX charm-fpic-gentoo.patch 963 RMD160 d725ce4085638996244db909d4b30ce0e5623bce SHA1 02e80605505bf1aa3ec371643b165f3890ba0cc1 SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec
-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 3792 RMD160 903fe8c7ced0e584d51aab2967bdd12096ad3cab SHA1 cb99052c898cedce63b5ec8c8cdf979f388dc449 SHA256 cc098b9b2313385c7ddb261b8789aa7ab1fecf291086a9ffe309bddfef6f1c61
-EBUILD charm-6.1.2-r2.ebuild 3106 RMD160 13d818cfbe2474cf63e607bd7c011112e2551c15 SHA1 d96219a313f7a6ae3e178964c8cb6d0ea742538f SHA256 75f9bc7b80e7d39129bb3f8d1adc9b8f09059d3d17849bd4168fba1fb1048423
-EBUILD charm-6.2.0.ebuild 3774 RMD160 e5cfebf7abf210df796472b988a99dc528fc8a7c SHA1 31bcaece974ea73cfc90daeb953d3008f028eb86 SHA256 7b57f72509c1a6ee012f3af3f4bee0658dfd225d7c6df71167de2d3c03c4c5fd
-MISC ChangeLog 5225 RMD160 3221d3166564f5aa61bbe48986af03a11d9882da SHA1 c1b556364c6ab8fdf9491958a47be228675f8ecc SHA256 d1cd113a8467fbf7e07d6aaf9da89511aa5a8d37485d05fd97dcd91a89715f0e
-MISC metadata.xml 301 RMD160 afeff445d5eb890d6877de384010939db515ee41 SHA1 faebd20bb776130073a9581ad2471da8afe403b1 SHA256 e0fd85a48178587b4c415b0c34c313f39d8002ae18bcae057f196eb9f79980e7
+AUX charm-5.9-gcc-4.2.patch 466 SHA256 6e83e80f1db4c25d70cebc8b14e76cb82fec473512e5a2b0474744e61892aa75 SHA512 6f65369ee105166ca3d8afc885b5a58d8175d95e071c22253312bc0fa7d7e4a136be1eafa4368448d8bd93c72732ae2c5b20425632cec6bae37d9b31ce105e58 WHIRLPOOL f76a522462cba84cb17aabe13a095f6082387ec76d77aa0c2b51aa2c4abc7252e190ab6b25d66bf55c1bc7df8a2eca1d6522493caba00716032674b39b54c2b1
+AUX charm-5.9-gcc4.patch 1701 SHA256 5d1ccf611c8f40c4e6572fcf1bb8cae1f0339a158df7bd698efcd396c28777cc SHA512 d320e6e06fddceea20ae51ae8bcfeee9a16b10d7868d53576b10d9bceb11c61d2d458d9b50467a52f766e9aa7c202b858ce260716fc27bba302351d77e2764ce WHIRLPOOL 57247a95777b070c4e22903c46572814e071994d8cefb0ad11aea57d65db1e7fb3b891adc58a70833b5780468e5cf3567b7c9e79cd530475db104a3cc63200ff
+AUX charm-6.1.2-charmc-gentoo.patch 983 SHA256 a512effc73e6e7d8c9e5ae3877d41496960207803b71dcb58c4c06ddb5ce6520 SHA512 9a6b1fd013e0579d75575523bca36d597e4e31378d27b5781f74b7b91739607aa1815ec2f04fd089dfcd4b8a5265d7d8f3e07b9f2825ecf1fcc85988a9977622 WHIRLPOOL 6946c7a32667e5232cbc96e1c9a2a803b1bba5eb6f2ee4ed2d5dbd47abd54e1929256c6def3dd0759e8a0718c35b7de9859462189a1dd195a0cb23a9aa1d5178
+AUX charm-6.1.2-charmrun.patch 451 SHA256 2e3a0279f81e76cfb5087f6c23cc0e39dff50618b0635925e373cd0c773ce603 SHA512 67636be003170f77224fc64c3063c39aa7d157159a90c8e83bbb5d1faf43bedaa469018a6e1db7084623e3b4bd124b814146bc42bd40c361e2bb2db3f9c48e0b WHIRLPOOL 2cfafbaae7e73322a83ead074980b100eaf16cea743eefd6d62ea90749a315a95b457cfeaa3d8aedb46ae7632eed7c4bf40813f23ba8cd9997591ca3335f49ac
+AUX charm-6.2.0-gcc-4.7.patch 1642 SHA256 a6dfa6db3b5c420492d19e2cd1dfc8b5b86d7b7cd1e5bf40d8b03954ee9d3fb0 SHA512 5ad11716fc0c4f96b59cbb16fa93f762ae9d627e8fe0fbd09c9572c248a0d8f638269059b701c7e11bcf3d87fadf1619710c030ccb465f77658c908f47d38c59 WHIRLPOOL 33166aae22a752af32377a1e829a35d1ab3c3bf21f2acf9b30aa714081e2ae557251bbaa9054a5f111276635b8f24aa13528711ce480e027baff0ed8986bcd47
+AUX charm-charmc-gentoo.patch 1078 SHA256 b903a12c4817268abf6d5797ea8cf5cfcae7ff09b969c1f073ffc08b0afbff7b SHA512 36d5d36241dc39656d45fbe7089b3cf5937e1eb6316a93aed7e67cef32773809d81c2b375716dd4a60061c3737481786745862f7b0a56dc046e5b6413df798ec WHIRLPOOL dd869dda68b9d4eec41662ad36b82671bbb8e3be9f988f858dabf918ed6bc10f97522fce6dd80e399adcd68cbbab065a558f9488418ed8368c90aa9763ec5322
+AUX charm-doc-makefile-gentoo.patch 1348 SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03 SHA512 3e33266740728274646ddd4f5e5833512a60118b388807075025d11f440a8a6d35a426b7749d3918882e0f476a5ca15a16b63640e89222915bcf91ee3c1704c1 WHIRLPOOL 1fe65b733a7f219ffe395bbcfec3746f62398ae02df302625ee3fad01e9b9f3f5e820dbb173b29ab750d8da41c15e23edf342f6dae52bd29c65367fb6640374a
+AUX charm-examples-gentoo.patch 3920 SHA256 8eafde8fc87500194bc1eda05c04fd138298e6a39785c50f4f66781a52f6c01e SHA512 cdd60e0ce4367e46c4b429119fd3377971f2efb1ab1b28b90c59c7c7fa8ee187762c356464672e2671cc24deef042774eec6fcaada53429135132f285ee7c050 WHIRLPOOL a5dab8f2fc25f37e35f9d8f2f10c69cbfa552e8fefd90e44337d9843403389e15181c6a01d450d6bc6f3ff57284d766d457850fe0d5e4e6d0ce34421aed75b31
+AUX charm-fpic-gentoo.patch 963 SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec SHA512 83ade166b8aa51fe0272cc5009b4828bb3d59007e1e059fea52155ef8747a89eda855115f06c5368ddbcbcbce33583acb46319d4cb62e52d9701b0e1e2415f18 WHIRLPOOL 23676c7c12921f57f073ebb06f9db1c0cb56f2900ffdb28f8a7b46084753b8d74edc6cbea73f6fd291a1c88df37bc922bd73c76b195d0cc5b8ca8cfabd43b5e3
+AUX charm-python-configure-gentoo.patch 984 SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d SHA512 6949975680d1dfb29e6e64176b96df796702440b0aabcf8c94b3573dbfd6dbb80035e6f771577920010632db1819a3a744b931cdc28f7096cd60e8164f21589c WHIRLPOOL 7d0f89ff740962519b04e74a554a4d10f527c83f187bd81624947182b8a3c181d78485bea211a1143174f0181b0693db33bafb3c8595f63c848de29552ce3614
+DIST charm-5.9.tar.gz 7580639 SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89
+DIST charm-6.1.2_src.tar.gz 24177223 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366
+DIST charm-6.2.0_src.tar.gz 17107602 SHA256 3ad35154be829ed5eb66b75aa50a9431a8bdf4ae502dbeabd6ec6839afbf9260
+DIST charm-6.5.0.tar.gz 19215019 SHA256 2f9b8a92a532924f056a398b46779d58a7f9cd58380ba32d22823a63065c8719 SHA512 5826cb83e7cf377c463d51c6206a48ad2d416f7d17cbfe5289980ee20005b3e20ad617f726114294e796a393abbdc60066ca5e2cd63c0f24f26c05b9a5dacce7 WHIRLPOOL 8f0ab920202acb48f1e5a4cc5ab1902c1f58c7cc61627c6637012743f011d12f131369b598071598afaf33ce53a407d167d06778a9de9c52f22877a4b1d4f25e
+EBUILD charm-5.9.ebuild 3792 SHA256 cc098b9b2313385c7ddb261b8789aa7ab1fecf291086a9ffe309bddfef6f1c61 SHA512 bb016138916cedd5a153c112c25a7310261f952a19f50e1ae401aee5ffc4b42e67628a8d87f97f4b04070360577664769796cc87eb6942c298869ea3b1085384 WHIRLPOOL 4c0b57f73084951a20595f58a59108204aa5f3a71c4c14e65a256c63172613a7146b476e72da21a84516c581ce1bdbe6b33f54a8df987f78d73b6d83acb0a0eb
+EBUILD charm-6.1.2-r2.ebuild 3106 SHA256 75f9bc7b80e7d39129bb3f8d1adc9b8f09059d3d17849bd4168fba1fb1048423 SHA512 b219168f2b1098c8c9bce620812a3df9c135d3d62b61214d0e9d2d4a200ab1661dcc47ce282b2997c55d40909c3462bb580e3e137b1b56308d0fa33099e74534 WHIRLPOOL 4883ca3d00914a7d183c2c4fd24f089e557e501b97721ad551c93f7d8922b5d1717d031aaf4b5dada633e10edc5333de8fe1e9b27e61ff863caac25a63828372
+EBUILD charm-6.2.0.ebuild 3774 SHA256 7b57f72509c1a6ee012f3af3f4bee0658dfd225d7c6df71167de2d3c03c4c5fd SHA512 a5c75b214dcef82aa02fd1142278c29ccbc22948778fc867a45f26f058265855621ea431f24663bcd63c4c1cd50cc5100a9a273b1ddc4503a8c868a64ead1eb0 WHIRLPOOL b1fd899990108f763f06008e4615cf59cc76cd20d1a1d370431841d57249b571a79e933d2c91545db5d0daea716706f00b5140573afd91c53bf525c80fec1fcc
+EBUILD charm-6.5.0.ebuild 4428 SHA256 2fc6071af94856d14834f33943d6f580a07958a438b31826a2b1f02b1bc08e1f SHA512 33496e1ed1d621d23a392bb61f37f2f1ec75dcb1181f076cddf6f194c3fd7d745d43feaab58f7555c002796051e1206617f2fc1158be58fbaf1043635f48b5be WHIRLPOOL 6a722a66cb367375cc461280678be5299249170e902f940a3719273c6e7320bd0cd86010c77bceab7df4eff765f75285a01c754d341ef4b04a766c8fc91e6188
+MISC ChangeLog 5375 SHA256 a91dfb472853722176b758b4dc7cade76effabbdc880e593f5bb19ef7f6c621f SHA512 4d79c89b2de48738b71e0f699439268f027a0f4b1b64d45d6f498ab4d3680f1424f6f1d6dacc8cd995c8bbbcaca85382b41449ad95978dc3e28644facff9674f WHIRLPOOL 8ea0047c61d9ad8eadfd54d99a450a8570c08ffc2bf6c566e3b6b386f2360d5425404880b0805df9719df40cd6a0d436fbadb91624647613b3aa18c35e5f7cbd
+MISC metadata.xml 575 SHA256 48dea62af1e9ab332b880fe2393b4e25da1153c82f7b8035a12b1b11afc7ab4f SHA512 3cb295d60c8850ec7af617c9e452edca5c14afe4e1aee0a9f5a42342a94ec72023a2c6abf3fdc6354202942123545e796335de98e8540b22fadd5d1ae5486459 WHIRLPOOL 9a38afc101042c153c4b1c04a0ec07ed81db11411bc32a035b62a274510a6a315880f0701ead8ef47cec5d060d895b99232c2fba10b73b9c9ba5f028db4159ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAk/wWtcACgkQgAnW8HDreRav1ACfb4m/5Uq8B2Di6AB67re2Ddzn
-U6AAn2PxQkkuDKYwZ+MDiIbYMWVdBb63
-=om0U
+iQEcBAEBCAAGBQJRy4AvAAoJEOeBhlrCAAWG11YH/RNMsW4Ji3PLcfet+qj7N1X3
+XeGZ/j52QIpTHGXkKUwj83db+LFlRmRi1htYvE0SBx5RPSv8og7rzM3tzPxnwzDG
+FtNpma5A9LqfvH2JCeOPhn8P6BivVg/suoAj/PHVGEkKu7QROf9OnTRcL3KCbutQ
+pOY1QgZdCNe7wse1afl60dhDMQUBqpURoIq9uXw+ihdLGZq2+wfoHUzyLiProttS
+1uCpQ2ov5AGrzRov7Nhx32LVhBjqV8LhNrwMhnAru0FCMa8zUlPj3AD2oPa6Gw8j
+eM1ZSnFCDIRqopaGccwxEdlwMz1aazn5t1MRM+XUmVAN7pVxv+Uv++CNO0A/flE=
+=UGDh
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild
new file mode 100644
index 000000000000..25982f85a5d4
--- /dev/null
+++ b/sys-cluster/charm/charm-6.5.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
+
+DESCRIPTION="Message-passing parallel language and runtime system"
+HOMEPAGE="http://charm.cs.uiuc.edu/"
+SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
+
+LICENSE="charm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base
+	)"
+
+REQUIRED_USE="
+	cmkopt? ( !charmdebug !charmtracing )
+	charmproduction? ( !charmdebug !charmtracing )"
+
+FORTRAN_STANDARD="90"
+
+src_prepare() {
+	# Build shared libraries by default.
+	CHARM_OPTS="--build-shared"
+	if use charmproduction; then
+		CHARM_OPTS+=" --with-production"
+	else
+		if use charmdebug; then
+			CHARM_OPTS+=" --with-charmdebug"
+		fi
+
+		if use charmtracing; then
+			CHARM_OPTS+=" --with-tracing --with-tracing-commthread"
+		fi
+	fi
+
+	# TCP instead of default UDP for socket comunication
+	# protocol
+	CHARM_OPTS+="$(usex tcp ' tcp' '')"
+
+	# enable direct SMP support using shared memory
+	CHARM_OPTS+="$(usex smp ' smp' '')"
+
+	# CMK optimization
+	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
+
+	sed \
+		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
+
+	sed \
+		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
+		-e "s:-o charmxi:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
+		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
+		-e "s:-o charmrun:${LDFLAGS} &:g" \
+		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
+		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-i \
+		src/scripts/Makefile \
+		src/arch/net/charmrun/Makefile || die
+
+	einfo "charm opts: ${CHARM_OPTS}"
+}
+
+src_compile() {
+	# Build charmm++ first.
+	./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \
+		${CHARM_OPTS} ${MAKEOPTS} ${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_test() {
+	make -C tests/charm++ test TESTOPTS="++local" || die
+}
+
+src_install() {
+	# Make charmc play well with gentoo before we move it into /usr/bin.
+	epatch "${FILESDIR}/charm-6.5.0-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"
+
+	# In the following, some of the files are symlinks to ../tmp which we need
+	# to dereference first (see bug 432834).
+
+	local i
+
+	# Install binaries.
+	for i in bin/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dobin "${i}"
+	done
+
+	# Install headers.
+	insinto /usr/include/${P}
+	for i in include/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		doins "${i}"
+	done
+
+	# Install static libs. Charm has a lot of .o "libs" that it requires at
+	# runtime.
+	if use static-libs; then
+		for i in lib/*.{a,o}; do
+			if [[ -L ${i} ]]; then
+				i=$(readlink -e "${i}") || die
+			fi
+			dolib "${i}"
+		done
+	fi
+
+	# Install shared libs.
+	for i in lib_so/*; do
+		if [[ -L ${i} ]]; then
+			i=$(readlink -e "${i}") || die
+		fi
+		dolib.so "${i}"
+	done
+
+	# Basic docs.
+	dodoc CHANGES README
+
+	# Install examples.
+	if use examples; then
+		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++/*
+	fi
+
+	# Install pdf/html docs
+	if use doc; then
+		cd "${S}"/doc
+		# Install pdfs.
+		insinto /usr/share/doc/${PF}/pdf
+		doins  doc/pdf/*
+		# Install html.
+		docinto html
+		dohtml -r doc/html/*
+	fi
+}
+
+pkg_postinst() {
+	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'."
+}
diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index f555a9f50c29..ea5896e21a07 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -2,7 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci</herd>
+	<maintainer>
+		<email>nicolasbock@gmail.com</email>
+	</maintainer>
 	<use>
+		<flag name="charmdebug">Enable the charm debugger</flag>
+		<flag name="charmproduction">Optimize performance of Charm++ runtime</flag>
+		<flag name="charmtracing">Enable tracing support in Charm++</flag>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>