Added gcc-4.3 compatibility patch.

Package-Manager: portage-2.1.5.2

4 files changed, 38 insertions, 14 deletions

diff --git a/sci-libs/minuit/ChangeLog b/sci-libs/minuit/ChangeLog
index 9359a6f6362a..d7fed290ec9e 100644
--- a/sci-libs/minuit/ChangeLog
+++ b/sci-libs/minuit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/minuit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.5 2008/05/17 10:15:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.6 2008/06/01 10:24:45 markusle Exp $
+
+  01 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/minuit-5.16.00-gcc4.3.patch, minuit-5.16.00.ebuild:
+  Added gcc-4.3 compatibility patch.
 
   17 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
   minuit-5.16.00.ebuild:
diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest
index 14f506da3f23..07456b86ab3b 100644
--- a/sci-libs/minuit/Manifest
+++ b/sci-libs/minuit/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX minuit-5.16.00-gcc4.3.patch 645 RMD160 addf25a93afc20ce6fb8fb1088368d54896ad9cc SHA1 a86b204d06b9b0670fcc930254de58b712e4f601 SHA256 42622b30b2672ede43e35da34868bbbaa4d76efd5b8945a50aac23be1db8b78d
 DIST Minuit2-5.16.00.tar.gz 438532 RMD160 72fc99cb798196a53b99e1bf52e2c8c7046dc582 SHA1 c1bc3dec0f3a3d2dd400188baca074ffb3cb9566 SHA256 db840e4983de0cea9fa1e861cd3c373c5effd969ad88849b1dd0894f80a02717
 DIST mntutorial.pdf 263735 RMD160 4ef7806018a0ac43e322325ab9ea716268ac65cd SHA1 c32bdc4fb130ea8baa32e5dd79a7bc701b313110 SHA256 a72207746c548f4b468b147c27552b4a1bc9762df2a19f9cb0f9ec297899ef07
 DIST mnusersguide.pdf 260072 RMD160 d3809c8c7f0b105fef61f23c63708ff926853c37 SHA1 ac8b0b8464c8cfd2d02bbdb14e97be6271272259 SHA256 cffef5faa1c4d6ac589d4bd40ea474302f55fab47ab2e711b37f1183870fb206
-EBUILD minuit-5.16.00.ebuild 1362 RMD160 d9ba92ef2d944f2cbc03a36fc4b4b604b37c835b SHA1 d2ed85f1d217c3ff728d130c288b835791fd31b4 SHA256 f82d8fe6a1595a6e6f33412fb0aab7d612fe58aaf6bc9acf5df5b458849ae49c
-MISC ChangeLog 904 RMD160 b9290fcdcc10c13d5f864431327881ffa0f91cb1 SHA1 0259fdce8b8c189cdf12131c94942b253eebdbaf SHA256 f07bb096cd733e8541da65409519d6efe5b7ce7af29da6dfc25324a84655b189
+EBUILD minuit-5.16.00.ebuild 1461 RMD160 41f9ad30b8d35e28a609ed48efdf9eb5f82d5ff9 SHA1 7ac7dd714a26e3d90bce7de10f49fc28cd6d16c4 SHA256 abc4aec10e37abf73319c55e4d7b8a826dd1fcdaf96f32e300c2d076608f3e26
+MISC ChangeLog 1056 RMD160 4aaeb02c8cc51720e3cd619b7fd9e62ccd8f7c23 SHA1 f7440182e35c42c5f6da4f5f811b601920942e61 SHA256 42841b0eef3c3279cc88b579ff530616cd60a0e295f05be5764b8ea4fb5ec365
 MISC metadata.xml 513 RMD160 b39287db8efaebceb857085cb7292e6a3ea4cea0 SHA1 1fe927943b8fe35422d2e09deea30a0b753f510a SHA256 79677ff9c17d87cd486e0f95e8e1fd89b6e69d9b74c0f9654eae216f5431a9f0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgusC4ACgkQ1ycZbhPLE2BjvACdE0E1K2yCncFyyEu8YCE5Re7x
-juMAn23feI2L/66oGUNZ0oKE8PoH24x2
-=ncyx
------END PGP SIGNATURE-----
diff --git a/sci-libs/minuit/files/minuit-5.16.00-gcc4.3.patch b/sci-libs/minuit/files/minuit-5.16.00-gcc4.3.patch
new file mode 100644
index 000000000000..e7b63574e248
--- /dev/null
+++ b/sci-libs/minuit/files/minuit-5.16.00-gcc4.3.patch
@@ -0,0 +1,20 @@
+diff -Naur Minuit2-5.16.00/src/MnUserTransformation.cxx Minuit2-5.16.00.new/src/MnUserTransformation.cxx
+--- Minuit2-5.16.00/src/MnUserTransformation.cxx	2006-07-05 12:04:25.000000000 -0400
++++ Minuit2-5.16.00.new/src/MnUserTransformation.cxx	2008-06-01 06:15:23.000000000 -0400
+@@ -10,6 +10,7 @@
+ #include "Minuit2/MnUserTransformation.h"
+ #include "Minuit2/MnUserCovariance.h"
+ 
++#include <cstdio>
+ #include <algorithm>
+ 
+ namespace ROOT {
+@@ -47,7 +48,7 @@
+    p[0] = 'p';
+    p[4] = '\0';
+    for(unsigned int i = 0; i < par.size(); i++) {
+-      std::sprintf(p+1,"%i",i);
++      sprintf(p+1,"%i",i);
+       Add(p, par[i], err[i]);
+    }
+ }
diff --git a/sci-libs/minuit/minuit-5.16.00.ebuild b/sci-libs/minuit/minuit-5.16.00.ebuild
index 569b16a4e87c..5d7e5c328916 100644
--- a/sci-libs/minuit/minuit-5.16.00.ebuild
+++ b/sci-libs/minuit/minuit-5.16.00.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.16.00.ebuild,v 1.3 2008/05/17 10:15:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.16.00.ebuild,v 1.4 2008/06/01 10:24:45 markusle Exp $
+
+inherit eutils
 
 MY_PN=Minuit2
 
@@ -20,6 +22,13 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+}
+
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"