Fixing build with GCC-4.5 wrt bug 322227. Thanks Diego for the report.

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

4 files changed, 255 insertions, 12 deletions

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index 7ebc1b8f6d1d..e7e204ea5cf6 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/hippodraw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.17 2010/05/29 16:43:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.18 2010/06/02 10:12:04 xarthisius Exp $
+
+  02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-gcc45.patch:
+  Fixing build with GCC-4.5 wrt bug 322227. Thanks Diego for the report.
 
   29 May 2010; Fabian Groffen <grobian@gentoo.org>
   hippodraw-1.21.3-r3.ebuild:
diff --git a/sci-visualization/hippodraw/Manifest b/sci-visualization/hippodraw/Manifest
index e3f9fc60f843..5ef9b1cee5d8 100644
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -1,6 +1,7 @@
 AUX hippodraw-1.21.3-autoconf-2.64.patch 1729 RMD160 2c0ebb3c3a3387049672e351cea0aa1fe485acf9 SHA1 fd7bcaf5ecc24939c5617759555bd45f14668266 SHA256 e60f8da1021c522e3b6d9e87f2d333fac6787c27baa649482142b78e2a1c7675
 AUX hippodraw-1.21.3-gcc4.3.patch 7310 RMD160 7fd794311627f762e476ba0e3cb0190600038e87 SHA1 35abf03f3d704891fa6d4bbf8bd9725045396eb3 SHA256 4945521437e9e8c211b743bcc4f5078629d35c1b56989734ecfbcd21c142d225
 AUX hippodraw-1.21.3-gcc4.4.patch 364 RMD160 e4bed68dde832ca010114049026272e047fca603 SHA1 b3a4f0fe5f20c0ec5fbfb3971116d00108c4119b SHA256 6e884d769ac1bf8d2c50370b4abd3f234c43d1fd590a47d91990fe518bb7bfd7
+AUX hippodraw-1.21.3-gcc45.patch 8265 RMD160 905578f705091c3cc6070edeb60a8ef86015a77e SHA1 1c11c599843e4d9712b29388fa517de5dd698a1d SHA256 a98804f2dda8407e119accd34428e71b34a103e145ebbfdf3708c3e4eebb1e0e
 AUX hippodraw-1.21.3-minuit2.patch 1922 RMD160 32c91e6648ba12292fa6e1d621e99a6e00d0b614 SHA1 dae13bc08a2990d27bcd1e8e0918c1de898e86ac SHA256 cf2d9d064e67a861b59c0f67fe2cfd57d660d481b9e5279eaad6624cc0f89366
 AUX hippodraw-1.21.3-numarray.patch 1162 RMD160 ab5e5a417ba5b0b7c214f7bea1c2641c91385531 SHA1 cf3d6edefe27934ffe11f52058a98885f1b81fb5 SHA256 b06eb6f33b7e080760d7e030942bd347bfd0ef8f78dbdb04e17ee21272b7d60f
 AUX hippodraw-1.21.3-qt4.patch 922 RMD160 e209a6f84b7f4f6801e84ff7fd2be9280e5d38fa SHA1 dceba968d390404d530182585b2ebd9f43707149 SHA256 9ced6a3607501d3ea93bd4e6e10ea66ef8c7092ff62638341ed1e7231f5c9184
@@ -8,6 +9,6 @@ AUX hippodraw-1.21.3-test-fix.patch 539 RMD160 3658745e4f8e449e845031ff561c5753a
 AUX hippodraw-1.21.3-wcslib.patch 879 RMD160 d339517136249a0a5c56edeb69abe652c82a9b06 SHA1 b7dde32740a1395ea2400be999e3b03edfb628c6 SHA256 49444a17b22b4448944c9b3e419c1fecb5ab551790705a1ac75bf5cd2957b670
 DIST HippoDraw-1.21.3.tar.gz 9087353 RMD160 33ab867739feda0caef29da9160c3e410de5fc35 SHA1 6959c564c0c366260b5b7ad81cce6efd2d30846b SHA256 a649dd51b4316ba54fad03cb7b39035ecd2d0efeea0cbff1a17d4790f7df0e28
 EBUILD hippodraw-1.21.3-r2.ebuild 3764 RMD160 d2d7d6dea9efdf13ddb0f2a0083296344ecab097 SHA1 bec34b48b2878bc9eac6a5b2da6697a1125d2479 SHA256 040644516fd8e3fac7a7a21a8761b21572358197f69495d47cf9305b13ee1732
-EBUILD hippodraw-1.21.3-r3.ebuild 4861 RMD160 e6eacf7dc0b4288445e8b0cfd180105e728a9b90 SHA1 e548031ea726e5fe2433b20bcbbfb1bb26ea9be1 SHA256 141a0ce9eb5851074607b5f1ea3fd91fde9ba59632aef1af8a6e1f08bea7f993
-MISC ChangeLog 3531 RMD160 9b08beae1e1a6871de0e9257f65f24e2e028ceea SHA1 e40d59d8bd9e39e28371fdf5c5615bd3b8a836fc SHA256 9354ee08b0e6c0d101ec80a610b15f4ab65099d33932a0eb174c7eb22058d019
+EBUILD hippodraw-1.21.3-r3.ebuild 4879 RMD160 3ce397a16445a3763d44113b1cb47b3f3eec8aa7 SHA1 dbd8eda9e33c5b88d47a4b121d8e840f3b6e65e3 SHA256 3f28e3f42bf9b8acffdbe0e1d05b0a477e9babc7aef3f20adb035023325552c1
+MISC ChangeLog 3729 RMD160 44a61c73d7f805127133ac2c2d24e197573abb2b SHA1 0d6e5ffcb408d250fa478912ee8f5ef7acd5d628 SHA256 105a2f5a664ae23643134065fa034e432d1f53452ca2d2ce81444499fb863c99
 MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc45.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc45.patch
new file mode 100644
index 000000000000..81f74628f62c
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc45.patch
@@ -0,0 +1,237 @@
+Fixing build with GCC-4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=322227
+
+--- qt/CanvasView.cxx
++++ qt/CanvasView.cxx
+@@ -1670,12 +1670,12 @@
+ 
+ 	  if ( cut_low < plotter_low )
+ 	    {
+-	      Range currentRange = Range::Range ( plotter_low, cut_high );
++	      Range currentRange = Range ( plotter_low, cut_high );
+ 	      cut1d -> setCutRangeAt ( currentRange , 0 );
+ 	    }
+ 	  if ( cut_high > plotter_high )
+ 	    {
+-	      Range currentRange = Range::Range ( cut_low , plotter_high );
++	      Range currentRange = Range ( cut_low , plotter_high );
+ 	      cut1d -> setCutRangeAt ( currentRange , 0 );
+ 	    }
+ 	}
+@@ -1697,23 +1697,23 @@
+ 
+ 	  if ( cut_low_x < plotter_low_x )
+ 	    {
+-	      Range currentRange = Range::Range ( plotter_low_x, cut_high_x );
++	      Range currentRange = Range ( plotter_low_x, cut_high_x );
+ 	      cut2d -> setCutRangeAt ( currentRange , 0 );
+ 	    }
+ 	  if ( cut_high_x > plotter_high_x )
+ 	    {
+-	      Range currentRange = Range::Range ( cut_low_x , plotter_high_x );
++	      Range currentRange = Range ( cut_low_x , plotter_high_x );
+ 	      cut2d -> setCutRangeAt ( currentRange , 0 );
+ 	    }
+ 	  
+ 	  if ( cut_low_y < plotter_low_y )
+ 	    {
+-	      Range currentRange = Range::Range ( plotter_low_y, cut_high_y );
++	      Range currentRange = Range ( plotter_low_y, cut_high_y );
+ 	      cut2d -> setCutRangeAt ( currentRange , 1 );
+ 	    }
+ 	  if ( cut_high_y > plotter_high_y )
+ 	    {
+-	      Range currentRange = Range::Range ( cut_low_y , plotter_high_y );
++	      Range currentRange = Range ( cut_low_y , plotter_high_y );
+ 	      cut2d -> setCutRangeAt ( currentRange , 1 );
+ 	    }
+ 	}
+@@ -1730,13 +1730,13 @@
+ 	  double old_high = oldRange.high();
+ 
+ 	  if ( datax < ( old_low + old_high ) / 2 ) {
+-	    Range currentRange = Range::Range ( datax , old_high );
++	    Range currentRange = Range ( datax , old_high );
+ 	    cut1d -> setCutRangeAt ( currentRange , 0 );
+ 	  }
+ 	  
+ 	  else
+ 	    {
+-	      Range currentRange = Range::Range ( old_low , datax );
++	      Range currentRange = Range ( old_low , datax );
+ 	      cut1d -> setCutRangeAt ( currentRange , 0 );
+ 	    }
+ 	  notifyObservers();
+@@ -1761,7 +1761,7 @@
+ 	  if ( ( dis_low_x <= 0.1 * (old_high_x - old_low_x)) &&
+ 	       ( dis_low_y <= 0.1 * (old_high_y - old_low_y)) &&
+ 	       ( m_edge == 0 ) || ( m_edge == 1 ) ) {
+-	    Range currentRange = Range::Range ( datax, old_high_x );
++	    Range currentRange = Range ( datax, old_high_x );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 
+ 	    // Handle shift drag.
+@@ -1775,10 +1775,10 @@
+ 	      // is protected.
+ 	      vector <double> adjusted;
+ 	      qtview->fillPickedPoint(view_left, view_bottom, adjusted);
+-	      currentRange = Range::Range ( adjusted[2], old_high_y );
++	      currentRange = Range ( adjusted[2], old_high_y );
+ 	    }
+ 	    else
+-	      currentRange = Range::Range ( datay, old_high_y );
++	      currentRange = Range ( datay, old_high_y );
+ 	    cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	    m_edge = 1;
+ 	  }
+@@ -1787,7 +1787,7 @@
+ 	  else if ( ( dis_low_x <= 0.1 * (old_high_x - old_low_x)) &&
+ 		    ( dis_high_y <= 0.1 * (old_high_y - old_low_y)) &&
+ 		    ( m_edge == 0 ) || ( m_edge == 2 ) ) {
+-	    Range currentRange = Range::Range ( datax, old_high_x );
++	    Range currentRange = Range ( datax, old_high_x );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 
+ 	    // Handle shift drag
+@@ -1801,10 +1801,10 @@
+ 	      // is protected.
+ 	      vector <double> adjusted;
+ 	      qtview->fillPickedPoint(view_left, view_top, adjusted);
+-	      currentRange = Range::Range ( old_low_y, adjusted[2]);
++	      currentRange = Range ( old_low_y, adjusted[2]);
+ 	    }
+ 	    else
+-	      currentRange = Range::Range ( old_low_y, datay );
++	      currentRange = Range ( old_low_y, datay );
+ 	    cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	    m_edge = 2;
+ 	  }
+@@ -1813,7 +1813,7 @@
+ 	  else if ( ( dis_high_x <= 0.1 * (old_high_x - old_low_x)) &&
+ 		    ( dis_low_y <= 0.1 * (old_high_y - old_low_y)) &&
+ 		    ( m_edge == 0 ) || ( m_edge == 3 ) ) {
+-	    Range currentRange = Range::Range ( old_low_x, datax );
++	    Range currentRange = Range ( old_low_x, datax );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 
+ 	    // Handle shift drag.
+@@ -1827,10 +1827,10 @@
+ 	      // is protected.
+ 	      vector <double> adjusted;
+ 	      qtview->fillPickedPoint(view_right, view_bottom, adjusted);
+-	      currentRange = Range::Range ( adjusted[2], old_high_y );
++	      currentRange = Range ( adjusted[2], old_high_y );
+ 	    }
+ 	    else
+-	      currentRange = Range::Range ( datay, old_high_y );
++	      currentRange = Range ( datay, old_high_y );
+ 	    cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	    m_edge = 3;
+ 	  }
+@@ -1839,7 +1839,7 @@
+ 	  else if ( ( dis_high_x <= 0.1 * (old_high_x - old_low_x)) &&
+ 		    ( dis_high_y <= 0.1 * (old_high_y - old_low_y)) &&
+ 		    ( m_edge == 0) || ( m_edge == 4 ) ) {
+-	    Range currentRange = Range::Range ( old_low_x, datax );
++	    Range currentRange = Range ( old_low_x, datax );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 
+ 	    // Handle shift drag.
+@@ -1853,10 +1853,10 @@
+ 	      // is protected.
+ 	      vector <double> adjusted;
+ 	      qtview->fillPickedPoint(view_right, view_top, adjusted);
+-	      currentRange = Range::Range ( old_low_y, adjusted[2] );
++	      currentRange = Range ( old_low_y, adjusted[2] );
+ 	    }
+ 	    else
+-	      currentRange = Range::Range ( old_low_y, datay );
++	      currentRange = Range ( old_low_y, datay );
+ 	    cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	    m_edge = 4;
+ 	  }
+@@ -1866,7 +1866,7 @@
+ 		    ( dis_low_x <= dis_low_y ) &&
+ 		    ( dis_low_x <= dis_high_y ) && 
+ 		    ( m_edge == 0 ) || ( m_edge == 5 ) ) {
+-	    Range currentRange = Range::Range ( datax, old_high_x );
++	    Range currentRange = Range ( datax, old_high_x );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 	    m_edge = 5;
+ 	  }
+@@ -1876,7 +1876,7 @@
+ 		    ( dis_high_x <= dis_low_y ) &&
+ 		    ( dis_high_x <= dis_high_y ) &&
+ 		    ( m_edge == 0 ) || ( m_edge == 6 ) ) {
+-	    Range currentRange = Range::Range ( old_low_x, datax );
++	    Range currentRange = Range ( old_low_x, datax );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 	    m_edge = 6;
+ 	  } 
+@@ -1886,7 +1886,7 @@
+ 		    ( dis_low_y <= dis_low_x ) &&
+ 		    ( dis_low_y <= dis_high_y ) &&
+ 		    ( m_edge == 0 ) || ( m_edge == 7 ) ) {
+-	    Range currentRange = Range::Range ( datay, old_high_y );
++	    Range currentRange = Range ( datay, old_high_y );
+ 	    cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	    m_edge = 7;
+ 	  }
+@@ -1894,7 +1894,7 @@
+ 	  // Top
+ 	  else 
+ 	    {
+-	      Range currentRange = Range::Range ( old_low_y, datay );
++	      Range currentRange = Range ( old_low_y, datay );
+ 	      cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	      m_edge = 8;
+ 	    }
+@@ -1924,7 +1924,7 @@
+ 	      high= old_pos;
+ 	    }
+ 
+-	    Range currentRange = Range::Range ( low, high );
++	    Range currentRange = Range ( low, high );
+ 	    cut1d -> setCutRangeAt ( currentRange , 0 );
+ 	  }
+ 	  notifyObservers();
+@@ -1947,7 +1947,7 @@
+ 	      low = datax;
+ 	      high = old_pos_x;
+ 	    }
+-	    Range currentRange = Range::Range ( low, high );
++	    Range currentRange = Range ( low, high );
+ 	    cut2d -> setCutRangeAt ( currentRange, 0 );
+ 
+ 	    if ( datay > old_pos_y ) {
+@@ -1958,7 +1958,7 @@
+ 	      low = datay;
+ 	      high = old_pos_y;
+ 	    }
+-	    currentRange = Range::Range ( low, high );
++	    currentRange = Range ( low, high );
+ 	    cut2d -> setCutRangeAt ( currentRange, 1 );
+ 	  }
+ 	  notifyObservers();
+@@ -1989,7 +1989,7 @@
+ 	      low = datax - width/2;
+ 	      high = datax + width/2;
+ 	    }
+-	  Range currentRange = Range::Range ( low, high );
++	  Range currentRange = Range ( low, high );
+ 	  cut1d -> setCutRangeAt (currentRange, 0 );
+ 	  notifyObservers();
+ 	}
+@@ -2033,9 +2033,9 @@
+ 	      high_y = datay + width_y/2;
+ 	    }
+ 
+-	  Range currentRange = Range::Range ( low_x, high_x );
++	  Range currentRange = Range ( low_x, high_x );
+ 	  cut2d -> setCutRangeAt (currentRange, 0 );
+-	  currentRange = Range::Range ( low_y, high_y );
++	  currentRange = Range ( low_y, high_y );
+ 	  cut2d -> setCutRangeAt (currentRange, 1 );
+ 	  notifyObservers();
+ 	}
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
index ae09674a41c2..4cd7ec89d177 100644
--- a/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.3 2010/05/29 16:43:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.4 2010/06/02 10:12:04 xarthisius Exp $
 
 EAPI="3"
 
@@ -47,14 +47,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-	epatch "${FILESDIR}"/${P}-gcc4.4.patch
-	epatch "${FILESDIR}"/${P}-numarray.patch
-	epatch "${FILESDIR}"/${P}-test-fix.patch
-	epatch "${FILESDIR}"/${P}-minuit2.patch
-	epatch "${FILESDIR}"/${P}-wcslib.patch
-	epatch "${FILESDIR}"/${P}-qt4.patch
-	epatch "${FILESDIR}"/${P}-autoconf-2.64.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch \
+	  "${FILESDIR}"/${P}-gcc4.4.patch \
+	  "${FILESDIR}"/${P}-gcc45.patch \
+	  "${FILESDIR}"/${P}-numarray.patch \
+	  "${FILESDIR}"/${P}-test-fix.patch \
+	  "${FILESDIR}"/${P}-minuit2.patch \
+	  "${FILESDIR}"/${P}-wcslib.patch \
+	  "${FILESDIR}"/${P}-qt4.patch \
+	  "${FILESDIR}"/${P}-autoconf-2.64.patch
 
 	echo "#!${EPREFIX}/bin/sh" > config/py-compile