Version bump, masked for a bit more testing.

(Portage version: 2.1.5.2)

5 files changed, 366 insertions, 5 deletions

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index 00e1cf8ebc35..c3c7a601c0dc 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-visualization/hippodraw
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.1 2007/02/23 15:12:58 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.2 2008/06/01 20:14:33 markusle Exp $
+
+*hippodraw-1.21.3 (01 Jun 2008)
+
+  01 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/hippodraw-1.21.3-gcc4.3.patch,
+  +files/hippodraw-1.21.3-numarray.patch, hippodraw-1.19.1.ebuild,
+  +hippodraw-1.21.3.ebuild:
+  Version bump, masked for a bit more testing. Added patch for gcc4.3
+  compatibility (also need >=boost-1.35 for gcc4.3). Changed license
+  to GPL-2 since this is what the LICENSE file in the tarball states.
 
 *hippodraw-1.19.1 (23 Feb 2007)
 
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
new file mode 100644
index 000000000000..f57c994841c8
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch
@@ -0,0 +1,201 @@
+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;
+ 
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch
new file mode 100644
index 000000000000..38b08e7f5b39
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch
@@ -0,0 +1,39 @@
+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/hippodraw-1.19.1.ebuild b/sci-visualization/hippodraw/hippodraw-1.19.1.ebuild
index f6f0c6f57d93..eb73c39e15c4 100644
--- a/sci-visualization/hippodraw/hippodraw-1.19.1.ebuild
+++ b/sci-visualization/hippodraw/hippodraw-1.19.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.19.1.ebuild,v 1.1 2007/02/23 15:12:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.19.1.ebuild,v 1.2 2008/06/01 20:14:33 markusle Exp $
 
 inherit eutils qt3
 
@@ -9,7 +9,7 @@ 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"
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="root fits numarray doc"
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3.ebuild
new file mode 100644
index 000000000000..a967078443c3
--- /dev/null
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/06/01 20:14:33 markusle Exp $
+
+inherit eutils qt3
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="root fits numarray doc"
+
+# minuit: included in root-5, but standalone cheaper to build
+# qt4 not implemented:
+# - won't work with sip on amd64
+# - is still under testing
+# opengl: completely buggy
+# wcslib: not yet implemented (wcslib has nasty build system)
+# sip: still buggy (gcc411 issue?)
+
+RDEPEND=">=dev-lang/python-2.3
+	>=dev-libs/boost-1.32
+	$(qt_min_version 3.1)
+	numarray? ( dev-python/numarray )
+	fits? ( sci-libs/cfitsio
+		numarray? ( dev-python/pyfits ) )
+	!root? ( >=sci-libs/minuit-5 )
+	root? ( >=sci-physics/root-5 )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+	epatch "${FILESDIR}"/${P}-numarray.patch
+
+	local docdir=/usr/share/doc/${PF}
+	# fix the install doc directory to gentoo's one
+	sed -i \
+		-e "s:\$(pkgdatadir)/html:${docdir}/html:" \
+		doc/Makefile.in
+
+	# fix an extra DESTDIR inherited from Makefile.am
+	sed -i \
+		-e "s:\$(DESTDIR)\$(pkgdatadir)/examples:${docdir}/examples:" \
+		examples/Makefile.in
+
+	# since we do not slot, remove version name in includes
+	sed -i \
+		-e 's/$(pkgincludedir)-$(VERSION)/$(pkgincludedir)/' \
+		*/Makefile.in
+
+	#if use sip; then
+	#	sed -i \
+	#		-e "s:/usr/local:/usr:g"\
+	#		-e "" \
+	#		sip/Makefile.in
+	#fi
+}
+
+src_compile() {
+
+	local myconf="--with-boost-include=/usr/include"
+	myconf="${myconf} --with-Qt-include-dir=/usr/qt/3/include"
+	myconf="${myconf} --with-Qt-lib-dir=/usr/qt/3/$(get_libdir)"
+	myconf="${myconf} --with-Qt-bin-dir=/usr/qt/3/bin"
+	myconf="${myconf} --with-boost-lib=/usr/$(get_libdir)"
+	myconf="${myconf} --with-boost-libname=boost_python"
+	#built_with_use dev-libs/boost threads && myconf="${myconf}-mt"
+
+	if use minuit && ! use root; then
+		myconf="${myconf} --with-minuit2-include=/usr/include"
+		myconf="${myconf} --with-minuit2-lib=/usr/$(get_libdir)"
+	fi
+
+	if use root; then
+		myconf="${myconf} --with-root-include=/usr/include/root"
+		myconf="${myconf} --with-root-lib=/usr/$(get_libdir)/root"
+	fi
+
+	if use fits; then
+		myconf="${myconf} --with-cfitsio-include=/usr/include"
+		myconf="${myconf} --with-cfitsio-lib=/usr/$(get_libdir)"
+	fi
+
+	econf \
+		$(use_enable numarray numarraybuild) \
+		$(use_enable doc help) \
+		${myconf} || die "econf failed"
+	# qtui failed with -j2, so build it first with -j1
+	emake -j1 -C qtui || die "make qtui failed"
+	emake || die "emake failed"
+	if use doc; then
+		make docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	make_desktop_entry hippodraw HippoDraw hippoApp \
+		Science	"/usr/share/${MY_PN}"
+	dodoc README DISCLAIMER.rtf
+}