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

Package-Manager: portage-2.1.7.4/cvs/Linux x86_64

4 files changed, 29 insertions, 24 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/Manifest b/sci-visualization/hippodraw/Manifest
index 33913760cff4..d1247201f480 100644
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-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
 AUX hippodraw-1.21.3-test-fix.patch 539 RMD160 3658745e4f8e449e845031ff561c5753a9fc9cda SHA1 774a47f7a1085940c63de8e652eefdd06652ae22 SHA256 f523f9298ec5887973831d42fa1881d9f6ac3bbd7656ffdb448eb197bc093bc9
 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 4221 RMD160 67c463ce50e012ae1baa706d0719f23590a921e0 SHA1 68773885d9d6bccfedafcf69dbc7849b42ef7806 SHA256 c41ee659d3a9f12ae599c1b781023a31c9075bc9534f19461ed488d09dcf68be
-MISC ChangeLog 2623 RMD160 aee418be7f808cec66d11f6eac7d69a45c9994be SHA1 b11b67ba176e4f7a36ef184f8767f14a41d42e48 SHA256 b3295e5875c8803b764e1a98a6ea8c54fe021e26ae4021c3282557a0269509f1
+EBUILD hippodraw-1.21.3-r1.ebuild 4139 RMD160 f0917c0075269a15cb2b585b95baec5d71380972 SHA1 e34d6f2fb64c6248ca4d96e4ceee89160762fdb0 SHA256 2045f334ab109fd760c62aed746ddea412591d76107c11957d2e66b682ddad32
+MISC ChangeLog 2830 RMD160 d615156c967796af6e92e1d4c22bd7832912c015 SHA1 828e61871810a8b485b35d03f81aa7e7ee1a0418 SHA256 fae1afcf03eccece37435b5c8f1cac9a72346ec0333b56f0263cdd03a0106ff8
 MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrDjesACgkQ+CZEqwt+F6bF7gCdGpml2fD46b8W/FhZWk7rY4u5
-QtYAoJE/nMGtuRfzU1NV494itV/fU12m
-=Emlh
------END PGP SIGNATURE-----
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"