Added patch for tests and gcc 4.3, and a fix for random parallel build failures, thanks Xarthisius for his work , bug #301491

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 37 insertions, 11 deletions

diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog
index 99c77e4db591..fa1a49e3e552 100644
--- a/sci-physics/clhep/ChangeLog
+++ b/sci-physics/clhep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/clhep
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.14 2009/12/13 17:51:06 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.15 2010/01/19 20:22:38 bicatali Exp $
+
+  19 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> clhep-2.0.4.5.ebuild,
+  +files/clhep-2.0.4.5-gcc4.3.patch:
+  Added patch for tests and gcc 4.3, and a fix for random parallel build
+  failures, thanks Xarthisius for his work , bug #301491
 
 *clhep-2.0.4.5 (13 Dec 2009)
 
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 3f353032ab80..37f3f9fd9bce 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX clhep-2.0.4.5-gcc4.3.patch 400 RMD160 08f56b6442e5ab138deca91d5f2c46900a602428 SHA1 81d8a065c57bf83688e42313655a58753c2e441e SHA256 106d2aa055814277f5bf8cf36c423deb159e0170e17b2ab70d408aaef93317d8
 DIST clhep-2.0.4.2.tgz 3577381 RMD160 731b3a1adca6e3d3fea7fd81f36e311279432a9c SHA1 2f40d1599390fea841dbb6d0ff5cbfff8ebcf151 SHA256 76878719ac91b1dc4cae2f811b1e483916ca06699d18574a9a78b83a19688ea8
 DIST clhep-2.0.4.3.tgz 3590896 RMD160 82f5af399e2698e04adc465e6bc95e61aab2077d SHA1 6692641375b3a09eceef492bc34be5617d6e3268 SHA256 1c247ad06baa26cd4bc55bf5ecd649fcf1d775188e64a8129025ea6b3baad74d
 DIST clhep-2.0.4.5.tgz 3616050 RMD160 3f9d7e139b599237ae1cdec6fd8a0f1fd5e36798 SHA1 48a595fd0ecfc2a9b009411162381aa294fb8451 SHA256 1cb6fb6ef293b88dfe0040b4ed82302a43b87cdb6ad9e172466336fdab1a3643
 EBUILD clhep-2.0.4.2.ebuild 1143 RMD160 005ce12043a8c76c6de433e75bdf1d87f020df16 SHA1 84f9598b89b7fe7b0441f28f526eea26c5210a56 SHA256 c2634d5d44ba9abc5544bff066aa69287b116661e963660cf7dd93a01d91e124
 EBUILD clhep-2.0.4.3.ebuild 1090 RMD160 5d5a1848013c95590fb5fbade35152fb7ce672e9 SHA1 efe4473816e400e0c8961e935ce37c0b233fb55b SHA256 85a9428a41ec627303b7546f1b7a6df2c518df3d159a9b86eb2a459c9c50f305
-EBUILD clhep-2.0.4.5.ebuild 1053 RMD160 2968eb377cd70b150c681fc738a036ef5b11b8a5 SHA1 32e6dfe33cba0ab97d4f66e3ac1b017635165334 SHA256 487b886963269edf9f36c4781fd26fe5b21703929bd3b669d64074e0edb5482f
-MISC ChangeLog 1987 RMD160 48b5df94be1cdba99d0d01553ed707dbd0366779 SHA1 530029ba3212356898b4ec1fb3e696379ecf0156 SHA256 c5a23cf019f0b5b26731bea6f8a5b867518c547e4771cfdeee0c9671666cccca
+EBUILD clhep-2.0.4.5.ebuild 1319 RMD160 3d2cb763a1c652e57e4a9a2e92b2907a65f1ea1b SHA1 da4b8cee0352c7eac8221e05f300c33cecc617b4 SHA256 4f9e551b300e6606d82b813a34abe0368e813c4c8fabd01fea1e0b1482aaa828
+MISC ChangeLog 2232 RMD160 0fa5f37cec6a68965a47b3a6fdce0f9423b409c1 SHA1 1d0b27d633e39166e443025489a96384578f162b SHA256 0fc9db49dd77d9d424cf410468d1b707a3abb78e9203c6209a1901f86907be66
 MISC metadata.xml 492 RMD160 482c437a909d4aefad8d96ee039b03f179dbcf84 SHA1 2cff1d3dc020fe63fc3129f5a8a5dd98786f0564 SHA256 0632fa6f3930b2c61c27235c29c74765d27f0fcbf10181578367e94001fbb14b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkslMsIACgkQ1ycZbhPLE2AILwCcCOgwPzdkNaEo57Vn02cuK+2W
-o7EAn3b0+tKlwVp2vVxCfk5/VTsSJyvo
-=SAui
+iEYEARECAAYFAktWHQAACgkQ1ycZbhPLE2DgBwCgjqKOt8aFHraddZJgX1rPZ5Wk
+3vcAoI0IX5BM3yvUjh2lenZPZ9Xpkv6T
+=uZOW
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/clhep/clhep-2.0.4.5.ebuild b/sci-physics/clhep/clhep-2.0.4.5.ebuild
index 7d14916faccb..b4a35e8ad0e7 100644
--- a/sci-physics/clhep/clhep-2.0.4.5.ebuild
+++ b/sci-physics/clhep/clhep-2.0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.0.4.5.ebuild,v 1.1 2009/12/13 17:51:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.0.4.5.ebuild,v 1.2 2010/01/19 20:22:38 bicatali Exp $
 
 EAPI=2
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="High Energy Physics C++ library"
 HOMEPAGE="http://www.cern.ch/clhep"
@@ -29,6 +29,14 @@ src_prepare() {
 		# need to rebuild because original configurations
 		# have buggy detection
 	done
+	for d in $(find . -name Makefile.am | xargs grep -l ": %\.cc"); do
+		sed -i \
+			-e 's|: %\.cc|: %\.cc \$(shareddir)|' \
+			-e 's|all-local: \$(shareddir)|all-local: |' \
+			${d} || die
+		# fixing parallel build
+	done
+	epatch "${FILESDIR}/${P}-gcc4.3.patch"
 	eautoreconf
 }
 
diff --git a/sci-physics/clhep/files/clhep-2.0.4.5-gcc4.3.patch b/sci-physics/clhep/files/clhep-2.0.4.5-gcc4.3.patch
new file mode 100644
index 000000000000..453c76e0e2e6
--- /dev/null
+++ b/sci-physics/clhep/files/clhep-2.0.4.5-gcc4.3.patch
@@ -0,0 +1,12 @@
+--- 2.0.4.5.orig/CLHEP/Random/test/testBug58950.cc	2009-12-07 18:49:51.000000000 +0000
++++ 2.0.4.5/CLHEP/Random/test/testBug58950.cc	2010-01-19 17:25:07.493351325 +0000
+@@ -9,6 +9,9 @@
+ #include <iostream> 

+ #include <stdexcept>

+ #include <cmath>

++#if __GNUC__ >=4 && __GNUC_MINOR__ >=3

++#include <cstdlib>

++#endif

+ #include "CLHEP/Random/RanecuEngine.h"

+ #include "CLHEP/Random/Random.h"

+