sys-cluster/charm: Build with gcc-4.7, #424379; repact LDFLAGS, #337558

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

4 files changed, 86 insertions, 9 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 07fb236c815c..b50ae919843b 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2012/02/15 19:10:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.33 2012/07/01 14:12:34 jlec Exp $
+
+  01 Jul 2012; Justin Lecher <jlec@gentoo.org> charm-6.2.0.ebuild,
+  +files/charm-6.2.0-gcc-4.7.patch:
+  Build with gcc-4.7, #424379; repact LDFLAGS, #337558
 
   15 Feb 2012; Justin Lecher <jlec@gentoo.org> charm-6.1.2-r2.ebuild,
   charm-6.2.0.ebuild, metadata.xml:
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 2eb2eadd9d69..80c6b5ef4caa 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -5,6 +5,7 @@ AUX charm-5.9-gcc-4.2.patch 466 RMD160 26686ecd228b9fe8d5ff7b5478b34aa2a20347ef
 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
@@ -15,13 +16,14 @@ DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a463481
 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 3050 RMD160 9be7c378792e009db65b41b2017aced9ebf5973b SHA1 b642c46a40b863795d6fe54154574518c0aaf2f8 SHA256 74dadbcd57829da336cdeca7f0326274a9e6d3c17397eb21c6f0d0f7ae3e9096
-MISC ChangeLog 5066 RMD160 b9935aa20e43c34cf13c0df42a77a57a5c494e0d SHA1 a76e7a27af62dc08d61f19af47418366a3cd2adf SHA256 b7dd259e0c35ff605defe3d15a18207f1b2529d2ef98857e91b6bca7fa272a26
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk88AycACgkQgAnW8HDreRZYzgCeItApOh900sa79Si8v2hn3OhY
-sEsAoJkv4RU0e/X8Ancxi61jQ7/oR7q7
-=UiEP
+iEYEAREKAAYFAk/wWtcACgkQgAnW8HDreRav1ACfb4m/5Uq8B2Di6AB67re2Ddzn
+U6AAn2PxQkkuDKYwZ+MDiIbYMWVdBb63
+=om0U
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/charm/charm-6.2.0.ebuild b/sys-cluster/charm/charm-6.2.0.ebuild
index 9bb0b1847787..e2b7f86f05a4 100644
--- a/sys-cluster/charm/charm-6.2.0.ebuild
+++ b/sys-cluster/charm/charm-6.2.0.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2012/02/15 19:10:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.3 2012/07/01 14:12:34 jlec Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
@@ -30,7 +30,11 @@ case ${ARCH} in
 		CHARM_ARCH="net-linux-amd64" ;;
 esac
 
+FORTRAN_STANDARD="90"
+
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+
 	# TCP instead of default UDP for socket comunication
 	# protocol
 	if use tcp; then
@@ -47,6 +51,28 @@ src_prepare() {
 		append-flags -DCMK_OPTIMIZE=1
 	fi
 
+	sed \
+		-e "/CMK_CF90/s:f90:${FC}:g" \
+		-e "/CMK_CXX/s:g++:$(tc-getCXX):g" \
+		-e "/CMK_CC/s:gcc:$(tc-getCC):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/net-linux*/*sh || die
+
+	sed \
+		-e "s:\(-o conv-cpm\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmxi\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmrun-silent\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmrun-notify\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmrun\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmd_faceless\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmd\):${LDFLAGS} \1:g" \
+		-i \
+			src/scripts/Makefile \
+			src/arch/net/charmrun/Makefile
+
+	append-cflags -DALLOCA_H
+
 	echo "charm opts: ${CHARM_OPTS}"
 }
 
diff --git a/sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch b/sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch
new file mode 100644
index 000000000000..b6ad30e22892
--- /dev/null
+++ b/sys-cluster/charm/files/charm-6.2.0-gcc-4.7.patch
@@ -0,0 +1,45 @@
+ src/util/cklists.h |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/util/cklists.h b/src/util/cklists.h
+index 2fc6938..df29138 100644
+--- a/src/util/cklists.h
++++ b/src/util/cklists.h
+@@ -47,8 +47,8 @@ class CkQ : private CkSTLHelper<T>, private CkNoncopyable {
+ 	mask = 0x0f;
+       }
+       T *newblk = new T[newlen];
+-      elementCopy(newblk,block+first,blklen-first);
+-      elementCopy(newblk+blklen-first,block,first);
++      this->elementCopy(newblk,block+first,blklen-first);
++      this->elementCopy(newblk+blklen-first,block,first);
+       delete[] block; block = newblk;
+       blklen = newlen; first = 0;
+     }
+@@ -197,7 +197,7 @@ class CkVec : private CkSTLHelper<T> {
+     }
+     void copyFrom(const this_type &src) {
+        makeBlock(src.blklen, src.len);
+-       elementCopy(block,src.block,blklen);
++       this->elementCopy(block,src.block,blklen);
+     }
+   public:
+     CkVec(): block(NULL), blklen(0), len(0) {}
+@@ -233,7 +233,7 @@ class CkVec : private CkSTLHelper<T> {
+       T *oldBlock=block; 
+       makeBlock(newcapacity,len);
+       if (newcapacity != blklen) return 0;
+-      elementCopy(block,oldBlock,len);
++      this->elementCopy(block,oldBlock,len);
+       delete[] oldBlock; //WARNING: leaks if element copy throws exception
+       return 1;
+     }
+@@ -504,7 +504,7 @@ class CkPupAblePtrVec : public CkVec< CkZeroPtr<T, CkPupAblePtr<T> > > {
+ 	}
+ 	void copy_from(const this_type &t) {
+ 		for (size_t i=0;i<t.length();i++)
+-			push_back((T *)t[i]->clone());
++			this->push_back((T *)t[i]->clone());
+ 	}
+ 	void destroy(void) {
+ 		for (size_t i=0;i<this->length();i++)