Moved patches to gentoo mirrors

(Portage version: 2.1.8.3/cvs/Linux x86_64)

12 files changed, 25 insertions, 687 deletions

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index a2bea1f81559..f49a3ae4fcbb 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,17 @@
 # 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.20 2010/07/16 17:33:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.21 2010/07/17 12:45:27 xarthisius Exp $
+
+  17 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  hippodraw-1.21.3-r3.ebuild, -files/hippodraw-1.21.3-autoconf-2.64.patch,
+  -files/hippodraw-1.21.3-automake-1.11.patch,
+  -files/hippodraw-1.21.3-gcc4.3.patch,
+  -files/hippodraw-1.21.3-gcc4.4.patch, -files/hippodraw-1.21.3-gcc45.patch,
+  -files/hippodraw-1.21.3-minuit2.patch,
+  -files/hippodraw-1.21.3-numarray.patch, -files/hippodraw-1.21.3-qt4.patch,
+  -files/hippodraw-1.21.3-test-fix.patch,
+  -files/hippodraw-1.21.3-wcslib.patch:
+  Moved patches to gentoo mirrors
 
   16 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
   -hippodraw-1.21.3-r2.ebuild:
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch
deleted file mode 100644
index 211e61033b71..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4 HippoDraw-1.21.3/config/m4/bnv_have_qt.m4
---- HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4	2006-12-08 14:15:35.000000000 -0500
-+++ HippoDraw-1.21.3/config/m4/bnv_have_qt.m4	2009-12-15 18:15:24.000000000 -0500
-@@ -438,8 +438,8 @@
-       bnv_save_CXXFLAGS="$CXXFLAGS"
-       echo "Saved cxxflgs"
-       CXXFLAGS="-I$bnv_qt_include_dir"
--      AC_TRY_LINK([#include <$qt_direct_test_header>],
--        $qt_direct_test_main,
-+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
-+        [[$qt_direct_test_main]])],
-       [
-         # Success.
-         # We can link with no special library directory.
-@@ -460,8 +460,8 @@
-           echo "Non-critical error, please neglect the above." >&AC_FD_CC
-           bnv_qt_lib=qt-gl
-           LIBS="-l$bnv_qt_lib"
--          AC_TRY_LINK([#include <$qt_direct_test_header>],
--            $qt_direct_test_main,
-+          AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
-+            [[$qt_direct_test_main]])],
-           [
-             # Success.
-             # We can link with no special library directory.
-@@ -496,14 +496,12 @@
-             done
-             # Try with that one
-             LIBS="-l$bnv_qt_libS"
--            AC_TRY_LINK([#include <$qt_direct_test_header>],
--              $qt_direct_test_main,
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
-+              [[$qt_direct_test_main]])],
-             [
-               # Success.
-               # We can link with no special library directory.
-               bnv_qt_lib_dir=
--            ], [
--              # Leave bnv_qt_lib_dir defined
-             ])
-           ])
-         ])
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch
deleted file mode 100644
index 26acbaeac29d..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=328545
-
---- pattern/Makefile.am
-+++ pattern/Makefile.am
-@@ -17,7 +17,6 @@
- 	Factory.h				\
- 	FactoryException.h			\
- 	Observer.h				\
--	Observer.h				\
- 	Observable.h				\
- 	string_convert.h			\
- 	libhippo.h
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch
deleted file mode 100644
index 647148d9365a..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Naur HippoDraw-1.21.3/axes/Range.cxx HippoDraw-1.21.3.new/axes/Range.cxx
---- HippoDraw-1.21.3/axes/Range.cxx	2007-05-08 14:47:27.000000000 -0400
-+++ HippoDraw-1.21.3.new/axes/Range.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -16,6 +16,7 @@
- 
- #include "Range.h"
- 
-+#include <ostream>
- #include <algorithm>
- 
- #include <cassert>
-diff -Naur HippoDraw-1.21.3/fits/FitsFile.cxx HippoDraw-1.21.3.new/fits/FitsFile.cxx
---- HippoDraw-1.21.3/fits/FitsFile.cxx	2007-05-17 13:57:10.000000000 -0400
-+++ HippoDraw-1.21.3.new/fits/FitsFile.cxx	2008-06-01 15:28:54.000000000 -0400
-@@ -15,7 +15,7 @@
- 
- #include <algorithm>
- #include <stdexcept>
--
-+#include <cstring>
- #include <cassert>
- 
- using std::string;
-diff -Naur HippoDraw-1.21.3/minimizers/Fitter.cxx HippoDraw-1.21.3.new/minimizers/Fitter.cxx
---- HippoDraw-1.21.3/minimizers/Fitter.cxx	2006-01-28 17:54:45.000000000 -0500
-+++ HippoDraw-1.21.3.new/minimizers/Fitter.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -13,6 +13,8 @@
- 
- #include "StatedFCN.h"
- 
-+#include <cstdlib>
-+#include <climits>
- #include <stdexcept>
- 
- using std::string;
-diff -Naur HippoDraw-1.21.3/minimizers/LMFitter.cxx HippoDraw-1.21.3.new/minimizers/LMFitter.cxx
---- HippoDraw-1.21.3/minimizers/LMFitter.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/minimizers/LMFitter.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -18,6 +18,7 @@
- #include "NumLinAlg.h"
- #include "StatedFCN.h"
- 
-+#include <climits>
- #include <algorithm>
- 
- #include <cmath>
-diff -Naur HippoDraw-1.21.3/minimizers/NumLinAlg.cxx HippoDraw-1.21.3.new/minimizers/NumLinAlg.cxx
---- HippoDraw-1.21.3/minimizers/NumLinAlg.cxx	2005-05-16 14:39:20.000000000 -0400
-+++ HippoDraw-1.21.3.new/minimizers/NumLinAlg.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -19,6 +19,7 @@
- #include <cmath>
- #include <cfloat>
- #include <cassert>
-+#include <cstdlib>
- 
- using std::ofstream;
- using std::ifstream;
-diff -Naur HippoDraw-1.21.3/projectors/DyHist1DProjector.cxx HippoDraw-1.21.3.new/projectors/DyHist1DProjector.cxx
---- HippoDraw-1.21.3/projectors/DyHist1DProjector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/DyHist1DProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -21,6 +21,7 @@
- #include "datasrcs/DataPointTuple.h"
- #include "datasrcs/NTuple.h"
- 
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/DyHist2DProjector.cxx HippoDraw-1.21.3.new/projectors/DyHist2DProjector.cxx
---- HippoDraw-1.21.3/projectors/DyHist2DProjector.cxx	2005-09-12 12:55:10.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/DyHist2DProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -24,7 +24,7 @@
- #include "binners/BinnerAxisFactory.h"
- 
- #include "datasrcs/NTuple.h"
--
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/EqualEntriesHist1DProjector.cxx HippoDraw-1.21.3.new/projectors/EqualEntriesHist1DProjector.cxx
---- HippoDraw-1.21.3/projectors/EqualEntriesHist1DProjector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/EqualEntriesHist1DProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -26,6 +26,7 @@
- #include <numeric>
- 
- #include <cfloat>
-+#include <climits>
- 
- #include <cassert>
- 
-diff -Naur HippoDraw-1.21.3/projectors/Map1Projector.cxx HippoDraw-1.21.3.new/projectors/Map1Projector.cxx
---- HippoDraw-1.21.3/projectors/Map1Projector.cxx	2007-04-27 14:14:52.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/Map1Projector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -25,7 +25,7 @@
- #include <numeric>
- 
- #include <cfloat>
--
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/Map2Projector.cxx HippoDraw-1.21.3.new/projectors/Map2Projector.cxx
---- HippoDraw-1.21.3/projectors/Map2Projector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/Map2Projector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -24,7 +24,7 @@
- #include <algorithm>
- 
- #include <cfloat>
--
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/MapMatrixProjector.cxx HippoDraw-1.21.3.new/projectors/MapMatrixProjector.cxx
---- HippoDraw-1.21.3/projectors/MapMatrixProjector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/MapMatrixProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -23,10 +23,10 @@
- 
- #include <algorithm>
- #include <numeric>
--
-+#include <climits>
- #include <cfloat>
- #include <cmath>
--
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/MeshProjector.cxx HippoDraw-1.21.3.new/projectors/MeshProjector.cxx
---- HippoDraw-1.21.3/projectors/MeshProjector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/MeshProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -24,7 +24,7 @@
- 
- #include <algorithm>
- #include <cfloat>
--
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/NTupleProjector.cxx HippoDraw-1.21.3.new/projectors/NTupleProjector.cxx
---- HippoDraw-1.21.3/projectors/NTupleProjector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/NTupleProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -23,7 +23,7 @@
- #include <algorithm>
- #include <functional>
- #include <stdexcept>
--
-+#include <climits>
- #include <cassert>
- 
- #ifdef ITERATOR_MEMBER_DEFECT
-diff -Naur HippoDraw-1.21.3/projectors/ProfileProjector.cxx HippoDraw-1.21.3.new/projectors/ProfileProjector.cxx
---- HippoDraw-1.21.3/projectors/ProfileProjector.cxx	2007-04-23 17:57:21.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/ProfileProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -27,7 +27,7 @@
- #include "datasrcs/NTuple.h"
- 
- #include <algorithm>
--
-+#include <climits>
- #include <cassert>
- 
- using namespace hippodraw;
-diff -Naur HippoDraw-1.21.3/projectors/StripChartProjector.cxx HippoDraw-1.21.3.new/projectors/StripChartProjector.cxx
---- HippoDraw-1.21.3/projectors/StripChartProjector.cxx	2005-10-29 20:10:14.000000000 -0400
-+++ HippoDraw-1.21.3.new/projectors/StripChartProjector.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -20,7 +20,7 @@
- #include "datasrcs/DataSource.h"
- 
- #include <algorithm>
--
-+#include <climits>
- #include <cassert>
- 
- using std::distance;
-diff -Naur HippoDraw-1.21.3/qt/QtApp.cxx HippoDraw-1.21.3.new/qt/QtApp.cxx
---- HippoDraw-1.21.3/qt/QtApp.cxx	2007-03-14 19:28:28.000000000 -0400
-+++ HippoDraw-1.21.3.new/qt/QtApp.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -26,6 +26,7 @@
- 
- #include "qdir.h"
- #include <cassert>
-+#include <cstdlib>
- 
- using std::string;
- 
-diff -Naur HippoDraw-1.21.3/qt/QtViewImp.cxx HippoDraw-1.21.3.new/qt/QtViewImp.cxx
---- HippoDraw-1.21.3/qt/QtViewImp.cxx	2007-06-28 16:03:02.000000000 -0400
-+++ HippoDraw-1.21.3.new/qt/QtViewImp.cxx	2008-06-01 15:28:20.000000000 -0400
-@@ -42,6 +42,7 @@
- #endif
- 
- #include <cassert>
-+#include <cstdlib>
- 
- using namespace hippodraw;
- 
---- HippoDraw-1.21.3/transforms/PeriodicBinaryTransform.cxx	2008-07-15 22:48:51.000000000 +0100
-+++ HippoDraw-1.21.3/transforms/PeriodicBinaryTransform.cxx	2008-07-15 22:49:25.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <stdexcept>
- #include <sstream>
- #include <cassert>
-+#include <cstring>
- 
- using namespace hippodraw;
- 
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.4.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.4.patch
deleted file mode 100644
index 64efbfc43f25..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur HippoDraw-1.21.3/reps/AxisRepBase.cxx HippoDraw-1.21.3.new/reps/AxisRepBase.cxx
---- HippoDraw-1.21.3/reps/AxisRepBase.cxx	2007-07-02 14:17:16.000000000 -0400
-+++ HippoDraw-1.21.3.new/reps/AxisRepBase.cxx	2009-11-12 22:03:11.000000000 -0500
-@@ -30,6 +30,7 @@
- 
- #include <cmath>
- #include <cassert>
-+#include <cstdio>
- 
- using std::max;
- using std::min;
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc45.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc45.patch
deleted file mode 100644
index 81f74628f62c..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc45.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-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/files/hippodraw-1.21.3-minuit2.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-minuit2.patch
deleted file mode 100644
index 8713b2ea46a6..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-minuit2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- config/m4/pfkeb_have_minuit2.m4.orig	2008-07-15 18:39:21.000000000 +0100
-+++ config/m4/pfkeb_have_minuit2.m4	2008-07-15 18:40:47.000000000 +0100
-@@ -44,7 +44,7 @@
-     [pfk_minuit2_include="/usr/local/include"])
- 
-   AC_ARG_WITH([minuit2-lib],
--    [  --with-minuit2-lib=DIR     Minuit2 libMinuit2Base.so file is in DIR 
-+    [  --with-minuit2-lib=DIR     Minuit2 libMinuit2.so file is in DIR 
-                                   (default:/usr/local/lib:/usr/lib)],
-     [pfk_minuit2_lib=$with_minuit2_lib],
-     [pfk_minuit2_lib="/usr/local/lib"])
-@@ -54,9 +54,9 @@
-   else
-     MINUIT2_CXXFLAGS="-I$pfk_minuit2_include"
-     if test x$enable_rpath = xno; then
--      MINUIT2_LDFLAGS="-L$pfk_minuit2_lib -lMinuit2Base"
-+      MINUIT2_LDFLAGS="-L$pfk_minuit2_lib -lMinuit2"
-     else
--      MINUIT2_LDFLAGS="-L$pfk_minuit2_lib -lMinuit2Base -R$pfk_minuit2_lib"
-+      MINUIT2_LDFLAGS="-L$pfk_minuit2_lib -lMinuit2 -R$pfk_minuit2_lib"
-     fi
-     AC_MSG_NOTICE([checking Minuit2 install with
-       MINUIT2_CXXFLAGS=$MINUIT2_CXXFLAGS
-@@ -65,18 +65,18 @@
-     PFK_SHARED_SUFFIX
-     no_good=no
-     AC_CHECK_FILE($pfk_minuit2_include/Minuit2/FCNBase.h,, no_good=yes )
--    AC_CHECK_FILE($pfk_minuit2_lib/libMinuit2Base.$pfk_so,, no_good=yes )
-+    AC_CHECK_FILE($pfk_minuit2_lib/libMinuit2.$pfk_so,, no_good=yes )
- 
-     if test x$no_good = xyes; then
-     MINUIT2_CXXFLAGS="-I/usr/include"
--    MINUIT2_LDFLAGS="-L/usr/lib -lMinuit2Base"
-+    MINUIT2_LDFLAGS="-L/usr/lib -lMinuit2"
-       AC_MSG_NOTICE([checking Minuit2 install with
-         MINUIT2_CXXFLAGS=$MINUIT2_CXXFLAGS
-         MINUIT2_LDFLAGS=$MINUIT2_LDFLAGS])
- 
-       no_good=no
-       AC_CHECK_FILE(/usr/include/Minuit2/FCNBase.h,, no_good=yes )
--      AC_CHECK_FILE(/usr/lib/libMinuit2Base.$pfk_so,, no_good=yes )
-+      AC_CHECK_FILE(/usr/lib/libMinuit2.$pfk_so,, no_good=yes )
-       if test x$no_good = xyes; then
-         have_minuit2=no
-       else
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch
deleted file mode 100644
index 38b08e7f5b39..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur HippoDraw-1.21.3/python/PyDataSource.cxx HippoDraw-1.21.3.new/python/PyDataSource.cxx
---- HippoDraw-1.21.3/python/PyDataSource.cxx	2007-08-24 18:19:16.000000000 -0400
-+++ HippoDraw-1.21.3.new/python/PyDataSource.cxx	2008-06-01 14:22:46.000000000 -0400
-@@ -444,9 +444,14 @@
- copy_direct ( boost::python::numeric::array array,
- 	      std::vector<double > & col )
- {
-+#ifdef HAVE_NUMARRAY
-   T * data = reinterpret_cast < T * > ( num_util::data ( array ) );
-   int size = num_util::size ( array );
-   std::copy ( data, data+ size, back_inserter( col ) );
-+#else
-+  throw std::runtime_error ("HippoDraw was not built with "
-+			     "numeric Python support" );
-+#endif
- }
- 
- void 
-@@ -454,6 +459,7 @@
- extractVector ( boost::python::numeric::array array,
- 		std::vector<double> & col )
- {
-+#ifdef HAVE_NUMARRAY
-   PyArray_TYPES type = num_util::type ( array );
- 
-   if ( num_util::iscontiguous ( array ) &&
-@@ -515,7 +521,11 @@
- 	  col.push_back ( boost::python::extract < double > ( result ) );
- 	}
-       }
--  } 
-+  }
-+#else
-+  throw std::runtime_error ("HippoDraw was not built with "
-+			     "numeric Python support" );
-+#endif
- }
- 
- PyDataSource *
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-qt4.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-qt4.patch
deleted file mode 100644
index 0225968b1bf0..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-qt4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- qt/QtApp.cxx.orig	2008-09-03 16:49:04.000000000 +0100
-+++ qt/QtApp.cxx	2008-09-03 16:50:32.000000000 +0100
-@@ -34,13 +34,13 @@
- 
- QtApp * QtApp::s_instance = 0;
- 
--QtApp::QtApp ( int argc, char** argv)
-+QtApp::QtApp ( int & argc, char** argv)
-   : QApplication ( argc, argv )
- {
-   init ();
- }
- 
--QtApp::QtApp ( int argc, char** argv, bool gui )
-+QtApp::QtApp ( int & argc, char** argv, bool gui )
-   : QApplication ( argc, argv, gui )
- {
-   init ();
---- qt/QtApp.h.orig	2008-09-03 16:49:50.000000000 +0100
-+++ qt/QtApp.h	2008-09-03 16:50:17.000000000 +0100
-@@ -79,11 +79,11 @@
- 
-   /** A Constructor that always enables the GUI.
-    */
--  QtApp ( int argc,  char ** argv );
-+  QtApp ( int & argc,  char ** argv );
- 
-   /** A Constructor that enables the GUI optionally.
-    */
--  QtApp ( int argc,  char ** argv, bool gui );
-+  QtApp ( int & argc,  char ** argv, bool gui );
- 
-   /** The destructor.  */
-   ~QtApp();
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-test-fix.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-test-fix.patch
deleted file mode 100644
index e7b14874ccc1..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-test-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur HippoDraw-1.21.3/testsuite/testXAxisModelLinear.cxx HippoDraw-1.21.3.new/testsuite/testXAxisModelLinear.cxx
---- HippoDraw-1.21.3/testsuite/testXAxisModelLinear.cxx	2004-05-02 13:18:38.000000000 -0400
-+++ HippoDraw-1.21.3.new/testsuite/testXAxisModelLinear.cxx	2008-07-07 21:17:10.000000000 -0400
-@@ -1,7 +1,7 @@
- #include "axes/AxisModelLinear.h"
- #include "axes/Range.h"
-   
--int main( int argc, char * argv )
-+int main( int argc, char ** argv )
- {
-   /*  XAxisModelLinear * axis, * axis2;
-       axis = new AxisModelLinear();
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-wcslib.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-wcslib.patch
deleted file mode 100644
index 6e1d9af082ce..000000000000
--- a/sci-visualization/hippodraw/files/hippodraw-1.21.3-wcslib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- qt/CanvasView.cxx.orig	2007-07-02 19:17:16.000000000 +0100
-+++ qt/CanvasView.cxx	2008-07-15 23:20:57.000000000 +0100
-@@ -67,9 +67,7 @@
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
- #ifdef _WIN32
--#include "wcslib/C/config.h"
- #else
--#include "wcslib/config.h"
- #endif
- #endif
- 
-@@ -2850,7 +2848,6 @@
- 
- #ifdef HAVE_WCSLIB
-   about += "<li> WCSlib ";
--  about += PACKAGE_VERSION;
- #endif
-   about += "</ul>";
- 
---- config/m4/pfkeb_have_wcslib.m4.orig	2008-07-16 16:11:34.000000000 +0100
-+++ config/m4/pfkeb_have_wcslib.m4	2008-07-16 16:11:50.000000000 +0100
-@@ -61,7 +61,7 @@
-   pfk_save_libs=$LIBS
-   LDFLAGS=$WCSLIB_LDFLAGS
-   AC_CHECK_FILE($pfk_wcslib_include/wcslib/wcs.h,, no_good=yes )
--  AC_CHECK_LIB(wcs, wcsset, no_good=no, no_good=yes )
-+  AC_CHECK_LIB(wcs, wcsset, , no_good=yes )
-   LDFLAGS=$pfk_save_ldflags
- # do not want -lwcs in LIBS
-   LIBS=$pfk_save_libs
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
index fab2dd61ca21..7c3a5d31f125 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.5 2010/07/16 17:32:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.6 2010/07/17 12:45:27 xarthisius Exp $
 
 EAPI="3"
 
@@ -14,7 +14,8 @@ MY_PN=HippoDraw
 
 DESCRIPTION="Highly interactive data analysis Qt environment for C++ and python"
 HOMEPAGE="http://www.slac.stanford.edu/grp/ek/hippodraw/"
-SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -47,16 +48,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	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 \
-	  "${FILESDIR}"/${P}-automake-1.11.patch
+	epatch "${WORKDIR}"/${P}-gcc4.3.patch \
+	  "${WORKDIR}"/${P}-gcc4.4.patch \
+	  "${WORKDIR}"/${P}-gcc45.patch \
+	  "${WORKDIR}"/${P}-numarray.patch \
+	  "${WORKDIR}"/${P}-test-fix.patch \
+	  "${WORKDIR}"/${P}-minuit2.patch \
+	  "${WORKDIR}"/${P}-wcslib.patch \
+	  "${WORKDIR}"/${P}-qt4.patch \
+	  "${WORKDIR}"/${P}-autoconf-2.64.patch \
+	  "${WORKDIR}"/${P}-automake-1.11.patch
 
 	echo "#!${EPREFIX}/bin/sh" > config/py-compile