Fix for compilation with gcc-4.6, #363539

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

5 files changed, 63 insertions, 10 deletions

diff --git a/sci-physics/hepmc/ChangeLog b/sci-physics/hepmc/ChangeLog
index 44d1e0044d2d..baf35b597980 100644
--- a/sci-physics/hepmc/ChangeLog
+++ b/sci-physics/hepmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/hepmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/ChangeLog,v 1.25 2011/02/18 17:10:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/ChangeLog,v 1.26 2011/04/14 08:12:45 jlec Exp $
+
+  14 Apr 2011; Justin Lecher <jlec@gentoo.org> hepmc-2.06.03.ebuild,
+  hepmc-2.06.04.ebuild, +files/hepmc-2.06.04-gcc46.patch:
+  Fix for compilation with gcc-4.6, #363539
 
   18 Feb 2011; Jeroen Roovers <jer@gentoo.org> hepmc-2.06.03.ebuild:
   Stable for HPPA (bug #354011).
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index 2fc79384cbeb..02e9b6e9cfd0 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX hepmc-2.06.04-gcc46.patch 622 RMD160 188f35922471a7379dd9a9d3b559c0b3007a35cd SHA1 f4632c4cb5fe8cf496d3820c3a5a8db6d270d79c SHA256 441ad1fa1ada849f76740e2874fa052f4b9fce5fee94ab79902f608a178436fd
 DIST HepMC-2.05.01.tar.gz 5138294 RMD160 403a9bc4b9987c992bb21e8bf5f5f2b838cd1b3e SHA1 ffc2048d2d146a0494fa010afdbe27db6f5b75e3 SHA256 d4c300bb33cf85b10a0cd073b390ec3ff5b2ad5cd408ab428c8debb20a92dccb
 DIST HepMC-2.06.03.tar.gz 4587543 RMD160 3c63afa80d9c0bef8f63460936f357de3d2a5ae0 SHA1 ece85e95494750d64e34ef31807d42c7888f21ee SHA256 6dc6de2df9e3a30b98d47a1ca0442a9513fcc5df0d6b5590364270903e96a6f3
 DIST HepMC-2.06.04.tar.gz 4594174 RMD160 9d28e1e1b075a04932d83270f0dab54f2b2e55b9 SHA1 1c82a58e7463658a0a6ebe1d2ea26d7dfa164ed3 SHA256 207b0ae1c5e2b1666d1e5b36335475f41296450bee6a31d11058d942aef025d8
 EBUILD hepmc-2.05.01.ebuild 1378 RMD160 810147d8cedbc8d215b96806efdc43d105e63766 SHA1 f8c7cb3812fa7ae97070c443e1da1dd6d52f5b1b SHA256 99ffc6a928ef7cf5abfef0a54bfc1caca76aec505c769b3549fc94b12cd9db34
-EBUILD hepmc-2.06.03.ebuild 1407 RMD160 0b0ef530d492566aeffa9c41a2dadcda5dc63e36 SHA1 ea7d131d8f9e2c4bae9124f4beb98e0f0755eb38 SHA256 296bc182072dd3543f7fb78957fc931f31c65fd93d1575dd333d07fd5b6746af
-EBUILD hepmc-2.06.04.ebuild 1441 RMD160 da63389c8952cc62359474ff85ef3d93027a7b8c SHA1 11a8caa127a556ce1194dc993b191b0e88946c2e SHA256 c1b95e2d59add2e6bf95eb1a631030cbe94828d6e3cd7504c0ade7e125385b1c
-MISC ChangeLog 3523 RMD160 01bbde2acc5f6bbba95f28a7c958e9434e71ffaa SHA1 a99e2d52f5210a654ee2bed7cb5cb05930cfecde SHA256 e7a3455c9c639910e51effc4727c164cf40751a19637995a763c74aa83ebfcdc
+EBUILD hepmc-2.06.03.ebuild 1490 RMD160 3714e0cfaca11f6bdcdf5226f48427eaffb6c3fc SHA1 1146f49819510b755a6593619116ad8fc94de7dd SHA256 065270ce9df5928fa1a88b82eac273ea78961397a4ae77be1a5ddcc4c9474a2d
+EBUILD hepmc-2.06.04.ebuild 1428 RMD160 5b61b3bce8d1771d39d45c2e5b69df67f802b7e4 SHA1 0d3b372777eee046504aabe0e3f395688062e3f8 SHA256 0ef42d1c929220ec4efd23009fa607e27383e38d2b73fbc070d788f66115360f
+MISC ChangeLog 3696 RMD160 c452328413e60bac897085a5442a932b248bd2a0 SHA1 79bb446ad3974bd2ea7f20966ab717d4bec86a37 SHA256 c0de84dbcdfe5e4ac2fd1bf3a81898a84fc959260a7c78d0922d9b0999edc983
 MISC metadata.xml 1291 RMD160 6f907411d6c897e4f01c06f97c535ea7c3af7875 SHA1 cb5af85bd4c34210192209a4f2242123982c3baa SHA256 56362a0f765e7b4ba3c38648e1930e1c1a253008d8e28a533ac407ee7d1b69ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2mrIMACgkQgAnW8HDreRZ2QgCggXFsVOpjFxv+tjpxCb7iJVxe
+LCMAoKv4vshPLXWSsgsJBbNFYhK+xjJm
+=pR1Q
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/hepmc/files/hepmc-2.06.04-gcc46.patch b/sci-physics/hepmc/files/hepmc-2.06.04-gcc46.patch
new file mode 100644
index 000000000000..9b19cf70ba9a
--- /dev/null
+++ b/sci-physics/hepmc/files/hepmc-2.06.04-gcc46.patch
@@ -0,0 +1,28 @@
+ HepMC/GenEvent.h  |    1 +
+ HepMC/GenVertex.h |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/HepMC/GenEvent.h b/HepMC/GenEvent.h
+index 72374cb..d10b9a0 100644
+--- a/HepMC/GenEvent.h
++++ b/HepMC/GenEvent.h
+@@ -137,6 +137,7 @@ namespace HepMC {
+ #include <vector>
+ #include <algorithm>
+ #include <iostream>
++#include <cstddef>
+ 
+ namespace HepMC {
+ 
+diff --git a/HepMC/GenVertex.h b/HepMC/GenVertex.h
+index 2f3d4de..fc3bf63 100644
+--- a/HepMC/GenVertex.h
++++ b/HepMC/GenVertex.h
+@@ -29,6 +29,7 @@
+ #include <vector>
+ #include <set>
+ #include <algorithm>
++#include <cstddef>
+ 
+ namespace HepMC {
+ 
diff --git a/sci-physics/hepmc/hepmc-2.06.03.ebuild b/sci-physics/hepmc/hepmc-2.06.03.ebuild
index cab77f156926..c00e70239c98 100644
--- a/sci-physics/hepmc/hepmc-2.06.03.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.03.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.06.03.ebuild,v 1.6 2011/02/18 17:10:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.06.03.ebuild,v 1.7 2011/04/14 08:12:45 jlec Exp $
 
 EAPI=2
 
+inherit eutils
+
 MYP=HepMC-${PV}
 
 DESCRIPTION="Event Record for Monte Carlo Generators"
@@ -21,6 +23,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MYP}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.06.04-gcc46.patch
+}
 src_configure() {
 	# use MeV over GeV and mm over cm
 	local length_conf="MM"
diff --git a/sci-physics/hepmc/hepmc-2.06.04.ebuild b/sci-physics/hepmc/hepmc-2.06.04.ebuild
index 4a19abdd3756..0df6948e492f 100644
--- a/sci-physics/hepmc/hepmc-2.06.04.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.04.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.06.04.ebuild,v 1.2 2011/02/13 17:36:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.06.04.ebuild,v 1.3 2011/04/14 08:12:45 jlec Exp $
 
-EAPI=3
+EAPI=4
+
+inherit eutils
 
 MYP=HepMC-${PV}
 
@@ -21,6 +23,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MYP}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+}
+
 src_configure() {
 	# use MeV over GeV and mm over cm
 	local length_conf="MM"
@@ -34,7 +40,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 	if use doc; then
 		cd doc
 		doxygen doxygen.conf || die "doc building failed"
@@ -46,9 +52,8 @@ src_install() {
 		DESTDIR="${ED}" \
 		INSTALLDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
 		doc_installdir="${EPREFIX}/usr/share/doc/${PF}" \
-		install || die "emake install failed"
+		install
 
-	dodoc README AUTHORS ChangeLog
 	insinto /usr/share/doc/${PF}
 	if use doc; then
 		doins -r doc/html doc/*.pdf || die