Fix bug #229691.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

4 files changed, 126 insertions, 8 deletions

diff --git a/sci-mathematics/xmds/ChangeLog b/sci-mathematics/xmds/ChangeLog
index 0df05dd0e1be..a1c397a88a4d 100644
--- a/sci-mathematics/xmds/ChangeLog
+++ b/sci-mathematics/xmds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/xmds
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/xmds/ChangeLog,v 1.3 2008/03/15 15:46:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/xmds/ChangeLog,v 1.4 2008/06/29 08:59:38 spock Exp $
+
+  29 Jun 2008; Michał Januszewski <spock@gentoo.org>
+  +files/xmds-1.6.5-gcc43.patch, xmds-1.6.5.ebuild:
+  Fix bug #229691.
 
   15 Mar 2008; Michał Januszewski <spock@gentoo.org> xmds-1.6.5.ebuild:
   Fix installation of docs and examples.
diff --git a/sci-mathematics/xmds/Manifest b/sci-mathematics/xmds/Manifest
index 4e9e484c41d9..523a69681ea6 100644
--- a/sci-mathematics/xmds/Manifest
+++ b/sci-mathematics/xmds/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xmds-1.6.5-gcc43.patch 5450 RMD160 2e03c3f4b0dca8c708f8e033feddaee6e1b0403f SHA1 48baa87471ac227039692d38cff69cdae1eb64a4 SHA256 048979e81b7b9d96130e3537375ef7e0239ca85909f40b8541fdba3c9505c588
 DIST xmds-1.6.4.tar.gz 580105 RMD160 a477dc9f9ea4867cf30304a3471b54fbde1ca88d SHA1 2631dab5868f1b94ac8f4135d6c5041952968d60 SHA256 c299198b69d6d8c74800a1464b485834ee088446d258f798b5577a995eb06f2e
 DIST xmds-1.6.5.tar.gz 528593 RMD160 7a42d9a58c73fea51f6415111ad7545810b5dfaa SHA1 cd352fd2ed360cc4eb9063120a8aa61badd3e046 SHA256 f7128c7c847bafd3a5ed582415cbddd1f31234278d62231faaeb9bec04d6b5ff
 DIST xmds_doc20080110.pdf 10361635 RMD160 7564d28b52fb55b506f87c383ec8235db4934003 SHA1 1b6e39e33f1acf82b906c539f74c28c424d40a39 SHA256 694fb66ccdcbbad91070a5853a4767ce67a99c28fc0cee89e4b3381837c11243
 DIST xmds_doc_20080226.pdf 8093270 RMD160 05f01541ea46a1f0fd0c45078270a2b5009c8bf4 SHA1 215889d8302b21eddb3fbe18550adb414d609e42 SHA256 93ca478d70cfc684cabb24e278181a50f70f4a2b769e8cf7028b6ecc1cb10009
 EBUILD xmds-1.6.4.ebuild 1065 RMD160 91931c9452dda552b6bc0b948b7915f6d9014714 SHA1 05e846a279bd3f2e9ec4cbb2e84e8e6ce34d481e SHA256 69d035ca5ff200061f620250eab53fbd3b7db912b36a30de4306d2c211053455
-EBUILD xmds-1.6.5.ebuild 1237 RMD160 390b22348fbfbf2b1cfa18c6e590ece51e52b0b9 SHA1 fb48b7eff65c8784adc030c16d3fbf156ecd56ba SHA256 e123d87066d7b17e409550fc572b43044f7f825c6db85c4b7c5a78a31fa90628
-MISC ChangeLog 582 RMD160 2c635f01514029b1371b02d6bc233ab673a5253f SHA1 0cca20e360af579ad073db426a846f4c710f8228 SHA256 3fd2472774fb39ebb1be7368df09f98ca2e92de25d1ceb9fbe51258e3012cbbd
+EBUILD xmds-1.6.5.ebuild 1331 RMD160 01a696f4b88af9e8d7006733ea92f47792da2813 SHA1 3106198c046fc2f927b6784ba540028d4f703248 SHA256 5bbefadcd815791f9659da85f714eb21a1781ee1f62f58f07994ab1638204f44
+MISC ChangeLog 708 RMD160 70cea22d1d6fe9344804bc47f9b2ea4896fe97d2 SHA1 df0b4895296706f620e4dba6df68cd5aaff4a833 SHA256 2712747941a1033bb8b9c1eebb7868bb2281863802e0b155d57733e71b682e81
 MISC metadata.xml 591 RMD160 970b4c9947cf13248f9ced0e498d04ff12202b01 SHA1 b8ca34cd7e5d1304a87ba04256c4e4acab2399ae SHA256 1cdbc7bb2bd9978b8a50add9f7c4917fdecd9df5d41d64ba10425730d4b03c2c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH2+9gchej4aZK9/cRArYSAJ9uE7k9hhHvbCrmL+uqgDDftVoX8gCghGeE
-5+RDlYtz9w0F9ZA9bDwJwzA=
-=2OV/
+iEYEARECAAYFAkhnTuUACgkQchej4aZK9/d0igCfS70DO01z2v6YoEE5qbmwwB9a
+PpEAn2Bm2uQUAWc8jlh3bnc0TOuca/f6
+=RO6o
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/xmds/files/xmds-1.6.5-gcc43.patch b/sci-mathematics/xmds/files/xmds-1.6.5-gcc43.patch
new file mode 100644
index 000000000000..766056d5ae51
--- /dev/null
+++ b/sci-mathematics/xmds/files/xmds-1.6.5-gcc43.patch
@@ -0,0 +1,108 @@
+diff -Naurp xmds-1.6.5-orig/source/xmds_integrate_ark45.cc xmds-1.6.5/source/xmds_integrate_ark45.cc
+--- xmds-1.6.5-orig/source/xmds_integrate_ark45.cc	2008-06-28 21:48:21.000000000 +0200
++++ xmds-1.6.5/source/xmds_integrate_ark45.cc	2008-06-28 21:48:57.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <xmds_simulation.h>
+ #include <xmds_vector.h>
+ #include <cstdlib>
++#include <cstring>
+ 
+ // **************************************************************************
+ // **************************************************************************
+@@ -289,7 +290,7 @@ void xmdsIntegrateARK45::writeTimestepEr
+       fprintf(outfile, "for(unsigned long _i0=0; _i0<_%s_size; _i0++){\n", fieldName);
+     }
+     fprintf(outfile, "   for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName);
+-    if (strcmp(typeName, "complex") == 0) {
++    if (std::strcmp(typeName, "complex") == 0) {
+       fprintf(outfile, "    _temp_mod=mod2(_%s_main[_%s_main_index_pointer + _i1]);\n", fieldName, fieldName);
+     }
+     else {
+@@ -347,7 +348,7 @@ void xmdsIntegrateARK45::writeTimestepEr
+     }
+     fprintf(outfile, "   for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++)\n", fieldName);
+ 
+-    if (strcmp(typeName, "complex") == 0) {
++    if (std::strcmp(typeName, "complex") == 0) {
+       fprintf(outfile, "       if(mod2(_%s_main[_%s_main_index_pointer + _i1])>_peak[_i1]){\n", fieldName, fieldName);
+       fprintf(outfile, "            _temp_error=mod(_%s_main[_%s_main_index_pointer + _i1]-_checkfield[_%s_main_index_pointer + _i1])/(mod(_%s_main[_%s_main_index_pointer + _i1])+1e-20);\n", fieldName, fieldName, fieldName, fieldName, fieldName);
+     }
+@@ -364,7 +365,7 @@ void xmdsIntegrateARK45::writeTimestepEr
+   else{ // if ndims==0
+     fprintf(outfile, "   for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName);
+ 
+-    if (strcmp(typeName, "complex") == 0) {
++    if (std::strcmp(typeName, "complex") == 0) {
+       fprintf(outfile, "       _temp_error=mod(_%s_main[_i1]-_checkfield[_i1])/(mod(_%s_main[_i1])+1e-20);\n", fieldName, fieldName);
+     }
+     else{
+diff -Naurp xmds-1.6.5-orig/source/xmds_integrate_ark89.cc xmds-1.6.5/source/xmds_integrate_ark89.cc
+--- xmds-1.6.5-orig/source/xmds_integrate_ark89.cc	2008-06-28 21:48:21.000000000 +0200
++++ xmds-1.6.5/source/xmds_integrate_ark89.cc	2008-06-28 21:48:57.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <xmds_simulation.h>
+ #include <xmds_vector.h>
+ #include <cstdlib>
++#include <cstring>
+ 
+ // **************************************************************************
+ // **************************************************************************
+@@ -284,7 +285,7 @@ void xmdsIntegrateARK89::writeTimestepEr
+       fprintf(outfile, "for (unsigned long _i0=0; _i0<_%s_size; _i0++){\n", fieldName);
+     }
+     fprintf(outfile, "   for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName);
+-    if (strcmp(typeName, "complex") == 0) {
++    if (std::strcmp(typeName, "complex") == 0) {
+       fprintf(outfile, "    _temp_mod=mod2(_%s_main[_%s_main_index_pointer + _i1]);\n", fieldName, fieldName);
+     }
+     else {
+@@ -334,7 +335,7 @@ void xmdsIntegrateARK89::writeTimestepEr
+     }
+     fprintf(outfile, "   for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++)\n", fieldName);
+ 
+-    if (strcmp(typeName, "complex") == 0) {
++    if (std::strcmp(typeName, "complex") == 0) {
+       fprintf(outfile, "       if (mod2(_%s_main[_%s_main_index_pointer + _i1])>_peak[_i1]){\n", fieldName, fieldName);
+       fprintf(outfile, "            _temp_error=mod(_%s_main[_%s_main_index_pointer + _i1]-_checkfield[_%s_main_index_pointer + _i1])/(mod(_%s_main[_%s_main_index_pointer + _i1])+1e-20);\n", fieldName, fieldName, fieldName, fieldName, fieldName);
+     }
+@@ -352,7 +353,7 @@ void xmdsIntegrateARK89::writeTimestepEr
+ 
+     fprintf(outfile, "   for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName);
+ 
+-    if (strcmp(typeName, "complex") == 0){
++    if (std::strcmp(typeName, "complex") == 0){
+       fprintf(outfile, "       _temp_error=mod(_%s_main[_i1]-_checkfield[_i1])/(mod(_%s_main[_i1])+1e-20);\n", fieldName, fieldName);
+     }
+     else{
+diff -Naurp xmds-1.6.5-orig/source/xmds_simulation.h xmds-1.6.5/source/xmds_simulation.h
+--- xmds-1.6.5-orig/source/xmds_simulation.h	2008-06-28 21:48:21.000000000 +0200
++++ xmds-1.6.5/source/xmds_simulation.h	2008-06-28 21:48:57.000000000 +0200
+@@ -40,6 +40,8 @@
+ #include <xmds_sequence.h>
+ #include <xmds_globals.h>
+ 
++#include <string>
++
+ // *****************************************************************************
+ // *****************************************************************************
+ //                              xmdsSimulation
+diff -Naurp xmds-1.6.5-orig/source/xsil2graphics.cc xmds-1.6.5/source/xsil2graphics.cc
+--- xmds-1.6.5-orig/source/xsil2graphics.cc	2008-06-28 21:48:21.000000000 +0200
++++ xmds-1.6.5/source/xsil2graphics.cc	2008-06-28 21:48:57.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include <xsil_field.h>
+ #include <getopt_xmds.h>
+ #include <iostream>
++#include <cstring>
+ 
+ // **********************************************************************
+ 
+@@ -306,7 +307,7 @@ int main(
+ 
+     const DOMString *mgName = nextElement->getAttribute("Name");
+     int mgNumber = i+1;
+-    if (strcmp("breakpoint", mgName->c_str()) == 0) {
++    if (std::strcmp("breakpoint", mgName->c_str()) == 0) {
+       mgNumber = 1;
+     }
+     else {
diff --git a/sci-mathematics/xmds/xmds-1.6.5.ebuild b/sci-mathematics/xmds/xmds-1.6.5.ebuild
index 33c83e90d24a..cef99e39faf1 100644
--- a/sci-mathematics/xmds/xmds-1.6.5.ebuild
+++ b/sci-mathematics/xmds/xmds-1.6.5.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-mathematics/xmds/xmds-1.6.5.ebuild,v 1.2 2008/03/15 15:46:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/xmds/xmds-1.6.5.ebuild,v 1.3 2008/06/29 08:59:38 spock Exp $
+
+inherit eutils
 
 doc_ver=20080226
 
@@ -20,6 +22,9 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-1.6.5-gcc43.patch
+	touch "${S}/source/version.h"
+
 	# Fix broken installation of sample scripts.
 	sed -i -e 's/install-data-am: install-dist_doc_examplesDATA install-man/install-data-am: install-man/' Makefile.in
 }