Drop PN from DESCRIPTION, resort ebuild, move to EAPI=4

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

5 files changed, 33 insertions, 28 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index f0c3dbf91780..07fb236c815c 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/charm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.31 2011/10/05 18:40:35 aballier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.32 2012/02/15 19:10:26 jlec Exp $
+
+  15 Feb 2012; Justin Lecher <jlec@gentoo.org> charm-6.1.2-r2.ebuild,
+  charm-6.2.0.ebuild, metadata.xml:
+  Drop PN from DESCRIPTION, resort ebuild, move to EAPI=4
 
   05 Oct 2011; Alexis Ballier <aballier@gentoo.org> charm-5.9.ebuild:
   remove ptex dep as it is going away
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index f5d655ebd30f..2eb2eadd9d69 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
@@ -14,14 +14,14 @@ DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SH
 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 3146 RMD160 0c160507c8585c88ae1ddf540782e19cd8296a81 SHA1 384572bc1637d5ed2a4bf1dd829e3c524c42f58d SHA256 c760b4459feef1988588875267c6b486b0c6fcdbdcf09ad2f507ec84cdfc3065
-EBUILD charm-6.2.0.ebuild 3092 RMD160 4fb6a5b3fd8387575201c149319748aa00f5a2ca SHA1 0005fb7565a8b28259f49fd19efc7f883e950546 SHA256 68b2da7b7389de6e5d0e6ebcf5e2209bf15f1aa9039899ee13f42b7947849d17
-MISC ChangeLog 4905 RMD160 60cb6ba8b786de122375d243cf1f5f0455c3c64f SHA1 a52efb54548a3e9ede182c051b34d6645cad487b SHA256 2df4855100ce1a98932204a4124290f83a9bb47507d0983e4c54276ce019a111
-MISC metadata.xml 301 RMD160 33178161cd82fc0f8c9c0c017af2e8e6479b7468 SHA1 d2436d58e768a8021223feab7729bc60a00d05e8 SHA256 8a9f74607266454c78f94120ed3f5d81ab8d01c72b54b8532521cf8742db1cb8
+EBUILD charm-6.1.2-r2.ebuild 3106 RMD160 13d818cfbe2474cf63e607bd7c011112e2551c15 SHA1 d96219a313f7a6ae3e178964c8cb6d0ea742538f SHA256 75f9bc7b80e7d39129bb3f8d1adc9b8f09059d3d17849bd4168fba1fb1048423
+EBUILD charm-6.2.0.ebuild 3050 RMD160 9be7c378792e009db65b41b2017aced9ebf5973b SHA1 b642c46a40b863795d6fe54154574518c0aaf2f8 SHA256 74dadbcd57829da336cdeca7f0326274a9e6d3c17397eb21c6f0d0f7ae3e9096
+MISC ChangeLog 5066 RMD160 b9935aa20e43c34cf13c0df42a77a57a5c494e0d SHA1 a76e7a27af62dc08d61f19af47418366a3cd2adf SHA256 b7dd259e0c35ff605defe3d15a18207f1b2529d2ef98857e91b6bca7fa272a26
+MISC metadata.xml 301 RMD160 afeff445d5eb890d6877de384010939db515ee41 SHA1 faebd20bb776130073a9581ad2471da8afe403b1 SHA256 e0fd85a48178587b4c415b0c34c313f39d8002ae18bcae057f196eb9f79980e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6MpKgACgkQvFcC4BYPU0o2CACfbYEBSU+kYot0yAIeHfCTYvy1
-7NkAn0U7X8OiLK4tHT+fm01Da8Pe8gUH
-=pnNz
+iEYEAREKAAYFAk88AycACgkQgAnW8HDreRZYzgCeItApOh900sa79Si8v2hn3OhY
+sEsAoJkv4RU0e/X8Ancxi61jQ7/oR7q7
+=UiEP
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/charm/charm-6.1.2-r2.ebuild b/sys-cluster/charm/charm-6.1.2-r2.ebuild
index 61657fc98a7b..8527ef32af96 100644
--- a/sys-cluster/charm/charm-6.1.2-r2.ebuild
+++ b/sys-cluster/charm/charm-6.1.2-r2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.5 2010/04/23 19:09:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.6 2012/02/15 19:10:26 jlec Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs flag-o-matic multilib
 
-DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
-LICENSE="charm"
+DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
 SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz"
 
@@ -15,9 +14,11 @@ 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 )"
+DEPEND="
+	doc? (
+		>=app-text/poppler-0.12.3-r3[utils]
+		dev-tex/latex2html
+		virtual/tex-base )"
 RDEPEND=""
 
 case ${ARCH} in
@@ -56,7 +57,6 @@ src_prepare() {
 
 src_compile() {
 	# build charmm++ first
-	cd "${S}"
 	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \
 		die "Failed to build charm++"
 
diff --git a/sys-cluster/charm/charm-6.2.0.ebuild b/sys-cluster/charm/charm-6.2.0.ebuild
index cef83d8ee83c..9bb0b1847787 100644
--- a/sys-cluster/charm/charm-6.2.0.ebuild
+++ b/sys-cluster/charm/charm-6.2.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.2 2012/02/15 19:10:26 jlec Exp $
 
-EAPI=2
-inherit eutils toolchain-funcs flag-o-matic multilib
+EAPI=4
 
-DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
-LICENSE="charm"
+inherit eutils flag-o-matic 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}_src.tar.gz"
 
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cmkopt tcp smp doc"
 
-DEPEND="doc? ( >=app-text/poppler-0.12.3-r3[utils]
+DEPEND="
+	doc? (
+	>=app-text/poppler-0.12.3-r3[utils]
 	dev-tex/latex2html
 	virtual/tex-base )"
 RDEPEND=""
@@ -50,7 +52,6 @@ src_prepare() {
 
 src_compile() {
 	# build charmm++ first
-	cd "${S}"
 	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \
 		die "Failed to build charm++"
 
diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index be41516e27b7..f555a9f50c29 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<use>
-		<flag name='cmkopt'>Enable CMK optimisation</flag>
-		<flag name='tcp'>Use TCP (instead of UPD) for socket communication</flag>
+		<flag name="cmkopt">Enable CMK optimisation</flag>
+		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>
 </pkgmetadata>