3 files changed, 136 insertions, 3 deletions
diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index cab61eaf0a45..007576d5039f 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/hippodraw
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.14 2009/12/15 23:26:12 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.15 2010/01/12 04:46:24 markusle Exp $
+
+*hippodraw-1.21.3-r2 (12 Jan 2010)
+
+  12 Jan 2010; Markus Dittrich <markusle@gentoo.org>
+  +hippodraw-1.21.3-r2.ebuild:
+  New revision with dropped qt3 support (fixes bug #299190).
 
   15 Dec 2009; Markus Dittrich <markusle@gentoo.org>
   hippodraw-1.21.3-r1.ebuild, +files/hippodraw-1.21.3-autoconf-2.64.patch:
diff --git a/sci-visualization/hippodraw/Manifest b/sci-visualization/hippodraw/Manifest
index 6cc94013a1bf..4283f2fd97fe 100644
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -8,5 +8,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-r1.ebuild 4186 RMD160 e99364d4a500a5fb5680ab1cb04287c16ab42765 SHA1 667e1da1ba329af612b317c9629f2c3b5d972d55 SHA256 9d7214907f167c51174ef77e423ad5cf159507700ab1e22e69b8f3e51f4a746a
-MISC ChangeLog 3045 RMD160 84daa264532a3a24a81ca2cadc926506262dc7b0 SHA1 8a6d69212a2b087ce65f9fa0be2b46387c61b1d4 SHA256 cef240cb7317a5b1df5277456fcc68dbb1238a8230e46977133b8fe6c4748e4e
+EBUILD hippodraw-1.21.3-r2.ebuild 3764 RMD160 d2d7d6dea9efdf13ddb0f2a0083296344ecab097 SHA1 bec34b48b2878bc9eac6a5b2da6697a1125d2479 SHA256 040644516fd8e3fac7a7a21a8761b21572358197f69495d47cf9305b13ee1732
+MISC ChangeLog 3227 RMD160 f3976710e2dfc284fca90dfbd134845f3504a374 SHA1 0b6d9a6ed36412d005b3e6d5a619bb1b26c93e22 SHA256 9179ade99fec22953993b63d6f5b72e464da3ea694625751a55ba33bed5574bf
 MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild
new file mode 100644
index 000000000000..3a10c94067eb
--- /dev/null
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild
@@ -0,0 +1,126 @@
+# 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-r2.ebuild,v 1.1 2010/01/12 04:46:24 markusle Exp $
+
+EAPI=2
+
+inherit eutils autotools multilib qt4
+
+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="doc examples +fits +numpy root wcs"
+
+CDEPEND="dev-libs/boost[python]
+	virtual/latex-base
+	media-libs/netpbm
+	dev-lang/python[threads]
+	fits? ( sci-libs/cfitsio )
+	numpy? ( dev-python/numpy )
+	x11-libs/qt-gui:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-assistant:4
+	root? ( >=sci-physics/root-5 )
+	!root? ( sci-libs/minuit )
+	wcs? ( sci-astronomy/wcslib )"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )"
+
+RDEPEND="${CDEPEND}
+	numpy? ( fits? ( dev-python/pyfits ) )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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
+
+	# fix the install doc directory to gentoo's one
+	local docdir=/usr/share/doc/${PF}
+	sed -i \
+		-e "s:\(docdir\).*=.*:\1= ${docdir}:" \
+		-e "s:\(INSTALLDIR\).*=.*:\1= \$(DESTDIR)${docdir}/html:" \
+		-e "/^DOCS_STR/s:\(DOCS_STR\).*=.*:\1 = \\\\\"${docdir}/html\\\\\":" \
+		-e "s:\$(pkgdatadir)/examples:${docdir}/examples:" \
+		-e 's:LICENSE:README:' \
+		{.,doc,examples,qt}/Makefile.am || die "sed for docdir failed"
+
+	AT_M4DIR=config/m4 eautoreconf
+}
+
+src_configure() {
+	local myconf="
+		--disable-numarraybuild
+		$(use_enable numpy numpybuild)
+		$(use_enable doc help)"
+	# All these longuish conf options are necessary
+	# or else a huge patch
+	myconf="${myconf} --with-Qt-include-dir=no"
+	myconf="${myconf} --with-Qt-lib-dir=no"
+	myconf="${myconf} --with-Qt-bin-dir=no"
+	myconf="${myconf} --with-qt4-include=/usr/include/qt4"
+	myconf="${myconf} --with-qt4-lib=/usr/$(get_libdir)/qt4"
+	myconf="${myconf} --with-qt4-dir=/usr"
+
+	if use root; then
+		myconf="${myconf} --with-root-include=$(root-config --incdir)"
+		myconf="${myconf} --with-root-lib=$(root-config --libdir)"
+		myconf="${myconf} --with-minuit2-lib=no"
+	else
+		myconf="${myconf} --with-minuit2-include=/usr/include"
+		myconf="${myconf} --with-minuit2-lib=/usr/$(get_libdir)"
+		myconf="${myconf} --with-root-lib=no"
+	fi
+
+	if use fits; then
+		myconf="${myconf} --with-cfitsio-include=/usr/include"
+		myconf="${myconf} --with-cfitsio-lib=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --with-cfitsio-lib=no"
+	fi
+
+	if use wcs; then
+		myconf="${myconf} --with-wcslib-include=/usr/include"
+		myconf="${myconf} --with-wcslib-lib=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --with-wcslib-include=no"
+		myconf="${myconf} --with-wcslib-lib=no"
+	fi
+
+	econf ${myconf} || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		emake docs || die "emake docs failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dosym ../${MY_PN}/hippoApp.png /usr/share/pixmaps/hippoApp.png
+	make_desktop_entry hippodraw HippoDraw hippoApp
+	if use examples; then
+		insinto /usr/share/doc/${PF}/testsuite
+		doins testsuite/*.py || die "examples install failed"
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.{fits,tnt,data,baddata}*
+	else
+		# these are automatically installed
+		rm -rf "${D}"usr/share/doc/${PF}/examples || die
+	fi
+}