Fix bug 250420 thanks to Joel <joel_123@hotmail.com>

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 70 insertions, 8 deletions

diff --git a/sci-chemistry/mustang/ChangeLog b/sci-chemistry/mustang/ChangeLog
index 1b4b461b76c0..befb97d8315e 100644
--- a/sci-chemistry/mustang/ChangeLog
+++ b/sci-chemistry/mustang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/mustang
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/ChangeLog,v 1.4 2008/04/29 10:30:16 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/ChangeLog,v 1.5 2008/12/19 20:22:42 loki_val Exp $
+
+  19 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mustang-3-gcc43.patch, mustang-3.ebuild:
+  Fix bug 250420 thanks to Joel <joel_123@hotmail.com>
 
   29 Apr 2008; Markus Dittrich <markusle@gentoo.org> ChangeLog:
   Redigested ebuild to fix broken Manifest (bug #219429).
diff --git a/sci-chemistry/mustang/Manifest b/sci-chemistry/mustang/Manifest
index acdebf0899d5..47ceffa2d591 100644
--- a/sci-chemistry/mustang/Manifest
+++ b/sci-chemistry/mustang/Manifest
@@ -1,4 +1,5 @@
+AUX mustang-3-gcc43.patch 2262 RMD160 d2f9d6de98f679af3b15507b42a410f1e0ba7e08 SHA1 532517644ceaaa0e4263cb04e78f3f47df450592 SHA256 2d9ec5f36d069e51909d56a58003c51bcd409c78946712753d313192c48558b2
 DIST mustang_v.3.tgz 164752 RMD160 e90e55a0cf31955277a68e51f91bc1e00417dacb SHA1 d6e34ecc3094ec1f2c1dbce703a572bf75f406dc SHA256 6d35597930c456d03bb05d644408fd00b1e060d9c8f83353f33b06a42654f552
-EBUILD mustang-3.ebuild 1067 RMD160 df0d64986b045ced6604d84bbe157cbf24162ab9 SHA1 e3ee1624dbeffbe4979c5ce507f91e29f7bf8d50 SHA256 89db72c8fc4151660fbd164bb919fb4af4958f56bf577827c62803adf5b7b6ee
-MISC ChangeLog 852 RMD160 dd4f7a2561c63624568b94f5d6a86af8f48e1df9 SHA1 bbd7319e9874ee65dd8b6f7b2975f3a5fa8c1ea5 SHA256 63b81beb24f14904bb1da710fcec32f9b9a8f4a1383b76181de070deea3fcf9c
+EBUILD mustang-3.ebuild 1126 RMD160 e7346977f2dd6b295021c7508b9572cb4438ccea SHA1 b1b0f9443f4d61a3fcb0b2a264769fcf73881421 SHA256 7153751c03d8d4506c37424de8d09c27e36d9a9c1320f44e1531c2244df5a178
+MISC ChangeLog 1011 RMD160 58e24b4585bf7bfabee3572aae147f1ae9112b7f SHA1 77d8d59f960271506afcbb3e673b6270062de0fd SHA256 c4ff86829ae8bf7bcc93118e7f5f9ab01bb48ed8f1d7614218d1f0a132c6deea
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/mustang/files/mustang-3-gcc43.patch b/sci-chemistry/mustang/files/mustang-3-gcc43.patch
new file mode 100644
index 000000000000..ef2818b92ed8
--- /dev/null
+++ b/sci-chemistry/mustang/files/mustang-3-gcc43.patch
@@ -0,0 +1,55 @@
+diff -u MUSTANG_v.3.orig/src/ew_2.cpp MUSTANG_v.3/src/ew_2.cpp
+--- MUSTANG_v.3.orig/src/ew_2.cpp	2008-01-15 11:18:34.000000000 -0700
++++ MUSTANG_v.3/src/ew_2.cpp	2008-12-09 10:47:22.000000000 -0700
+@@ -36,6 +36,7 @@
+ using std::ifstream;
+ 
+ #include<math.h>
++#include <cstdlib>
+ #include "macros.h"
+ #include "globals.h"
+ #include "ew.h"
+diff -u MUSTANG_v.3.orig/src/multiple_superposition.cpp MUSTANG_v.3/src/multiple_superposition.cpp
+--- MUSTANG_v.3.orig/src/multiple_superposition.cpp	2008-01-15 11:18:34.000000000 -0700
++++ MUSTANG_v.3/src/multiple_superposition.cpp	2008-12-09 10:49:00.000000000 -0700
+@@ -51,6 +51,7 @@
+ #include "alloc_routines.h"
+ #include "de_alloc_routines.h"
+ #include <cmath>
++#include <cstdlib>
+ #define THRESH 0.0001
+ 
+ void MOVE_TO_CENTER_OF_GRAVITY( int NSTRUC , int NRES , float ***R , float **CMs )
+diff -u MUSTANG_v.3.orig/src/multiple_superposition.h MUSTANG_v.3/src/multiple_superposition.h
+--- MUSTANG_v.3.orig/src/multiple_superposition.h	2008-01-15 11:18:34.000000000 -0700
++++ MUSTANG_v.3/src/multiple_superposition.h	2008-12-09 10:48:11.000000000 -0700
+@@ -25,3 +25,4 @@
+ #define MULT_SUPERPOSE
+ void  M_SUPERPOSE( int , int , float***, float** , float*** ) ;
+ #endif
++#include <cstdlib>
+diff -u MUSTANG_v.3.orig/src/pdb_ripper.h MUSTANG_v.3/src/pdb_ripper.h
+--- MUSTANG_v.3.orig/src/pdb_ripper.h	2008-01-15 11:18:34.000000000 -0700
++++ MUSTANG_v.3/src/pdb_ripper.h	2008-12-09 10:46:47.000000000 -0700
+@@ -29,4 +29,5 @@
+ void PARSE_ENTIRE_PDB_STRUCTURE( char * , int ) ;
+ 
+ #endif
++#include <cstdlib>
+ 
+diff -u MUSTANG_v.3.orig/src/progress_align.h MUSTANG_v.3/src/progress_align.h
+--- MUSTANG_v.3.orig/src/progress_align.h	2008-01-15 11:18:34.000000000 -0700
++++ MUSTANG_v.3/src/progress_align.h	2008-12-09 10:47:50.000000000 -0700
+@@ -25,3 +25,4 @@
+ #define PROG_ALGN_H
+ void PROGRESSIVE_ALIGNMENT_USING_EXTENDED_EDGE_WEIGHTS() ;
+ #endif
++#include <cstdlib>
+diff -u MUSTANG_v.3.orig/src/read_structures.h MUSTANG_v.3/src/read_structures.h
+--- MUSTANG_v.3.orig/src/read_structures.h	2008-01-15 11:18:34.000000000 -0700
++++ MUSTANG_v.3/src/read_structures.h	2008-12-09 10:46:22.000000000 -0700
+@@ -26,3 +26,4 @@
+ void READ_STRUCTURES( char **paths );
+ void READ_ENTIRE_PDBS( char **paths) ;
+ #endif
++#include <cstdlib>
diff --git a/sci-chemistry/mustang/mustang-3.ebuild b/sci-chemistry/mustang/mustang-3.ebuild
index 549578b67cee..3cc52e09817a 100644
--- a/sci-chemistry/mustang/mustang-3.ebuild
+++ b/sci-chemistry/mustang/mustang-3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/mustang-3.ebuild,v 1.3 2006/12/11 06:21:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mustang/mustang-3.ebuild,v 1.4 2008/12/19 20:22:42 loki_val Exp $
 
-inherit toolchain-funcs
+inherit base toolchain-funcs
 
 MY_PN="MUSTANG"
 SRC_P="${PN}_v.${PV}"
@@ -12,12 +12,14 @@ HOMEPAGE="http://www.cs.mu.oz.au/~arun/mustang/"
 SRC_URI="${HOMEPAGE}${SRC_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_compile() {
 	emake \
 		CPP=$(tc-getCXX) \
@@ -32,7 +34,7 @@ src_test() {
 
 src_install() {
 	newbin bin/MUSTANG_v.3 mustang
-	dodoc README.txt
+	mv mustang mustang.1
 }
 
 pkg_postinst() {