Ebuild cleanup and added missing dependency on boost[python] (bug #292880).

(Portage version: 2.1.7.4/cvs/Linux x86_64)

3 files changed, 26 insertions, 12 deletions

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index 0589a8af01a3..48eacc5cd184 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2009/09/30 16:57:04 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.13 2009/11/13 03:45:51 markusle Exp $
+
+  13 Nov 2009; Markus Dittrich <markusle@gentoo.org>
+  hippodraw-1.21.3-r1.ebuild, +files/hippodraw-1.21.3-gcc4.4.patch:
+  Ebuild cleanup and added missing dependency on boost[python] 
+  (bug #292880).
 
   30 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> hippodraw-1.21.3-r1.ebuild:
   Removed obsolete QT_BUILT_WITH_USE and dependency on Qt metapackage
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
new file mode 100644
index 000000000000..64efbfc43f25
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.4.patch
@@ -0,0 +1,11 @@
+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/hippodraw-1.21.3-r1.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
index fd7656a80cd9..8fb31d238ad1 100644
--- a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 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-r1.ebuild,v 1.7 2009/09/30 16:57:04 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.8 2009/11/13 03:45:51 markusle Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils autotools multilib qt3 qt4
 
@@ -17,9 +17,10 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="doc examples +fits +numpy qt4 root wcs"
 
-CDEPEND="dev-libs/boost
+CDEPEND="dev-libs/boost[python]
 	virtual/latex-base
 	media-libs/netpbm
+	dev-lang/python[threads]
 	fits? ( sci-libs/cfitsio )
 	numpy? ( dev-python/numpy )
 	qt4? (
@@ -41,17 +42,12 @@ RDEPEND="${CDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 pkg_setup() {
-	# need python threads (see bug #224269)
-	if ! built_with_use dev-lang/python threads; then
-		die "hippodraw needs dev-lang/python with USE=\"threads\""
-	fi
 	use qt4 && qt4_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+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
@@ -71,7 +67,7 @@ src_unpack() {
 	AT_M4DIR=config/m4 eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf="
 		--disable-numarraybuild
 		$(use_enable numpy numpybuild)
@@ -120,7 +116,9 @@ src_compile() {
 	fi
 
 	econf ${myconf} || die "econf failed"
+}
 
+src_compile() {
 	emake || die "emake failed"
 	if use doc; then
 		emake docs || die "emake docs failed"