Add missing deps for hdf5 and PyQt4/sip support

Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64

3 files changed, 49 insertions, 48 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 31c15cb27395..8d229e38608e 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.90 2011/12/27 18:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.91 2011/12/29 11:39:17 jlec Exp $
+
+  29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
+  Add missing deps for hdf5 and PyQt4/sip support
 
 *vtk-5.8.0 (27 Dec 2011)
 
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 1fe3335d9a6b..b0dcca66f371 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -32,13 +32,13 @@ EBUILD vtk-5.4.2-r1.ebuild 6379 RMD160 f796f2c974ca58fe7b34b62057d832e76950e6d8
 EBUILD vtk-5.6.0-r2.ebuild 7196 RMD160 c0e5497c113fffc6dc5ae543042f0abc0dd75cd0 SHA1 afb0f9565798ead6306f1a0a8e6ff955676de804 SHA256 9ebd57afe34faa0a5f1d9a9848cc88a22d1778eb526e68cfff385b8bc68bb7ee
 EBUILD vtk-5.6.0-r3.ebuild 7032 RMD160 1ab1e048e4472dcbb1a31a1f54ec1e5c8838aaae SHA1 0c1727eb6d5980cce1dbf4954eed6f6a80a615ff SHA256 ca7feddd527f9d8643ddb422ee112ece0507a5ba1b44eaef70d838cd5e96f174
 EBUILD vtk-5.6.1.ebuild 7154 RMD160 566b4d64fd0dfaea6c0c27b2d437c785cda05e24 SHA1 69e8b9e970439ef6e7decb100e1b8e601f64f577 SHA256 4778a4d79b6db8bccf7e07823415df6678fb2c1710a6f5bce225d94d2b850f9d
-EBUILD vtk-5.8.0.ebuild 7233 RMD160 c90617e0e3704da97ad32f6ebb6d37efe1b97f3b SHA1 a40bdce0ae335602aadcf7c11bcd33b725e29ee7 SHA256 1c52cc76e804ebc3a96d14cb93a991c2320fc61a5374dd3e4514102d764cf17e
-MISC ChangeLog 15207 RMD160 a5e66d8d244f345d728cea733969fede980382b0 SHA1 ad890f4399d0ec1dbf10378c9f011cc062b8ee56 SHA256 a864d975d2209b96eba50959f6a165193ddc69c5df424bb7607297153bbf6e40
+EBUILD vtk-5.8.0.ebuild 7013 RMD160 8225c80eaffdb5e096583f9e29126b03a56e0a59 SHA1 c0e9293560afc9eab32ffaedec1f9b17e1c47f60 SHA256 7bd3d238cb638980898bc09f1b0de58b678482d281cbfb5658efe57c1c389bf7
+MISC ChangeLog 15323 RMD160 0647dd13e2d58a94b39ae3f0eb9f7bb86e4965f2 SHA1 012b128775c059ff81f4fa805402815c0beba6f3 SHA256 74d2d20e8fadb5ea7ad759db5471c6c295476e3d37c23abf27f6ef5f7f2c5991
 MISC metadata.xml 489 RMD160 1bf8f7af20c7e220d6ac248966c4b4eca7f807ac SHA1 cc32ba8468c91494fcbaccdd0f8373259ca6e74b SHA256 16006ed96a705ea53dd5839112d5f9556c00cf830a058bdb2492f8aa55439de6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk76FBEACgkQgAnW8HDreRaQKgCfWYoc2/OI268XchEqHKQNQKc1
-d20AmwR2NiuBBLUG8AvQw1YQ9zhZLVaz
-=00Ze
+iEYEAREKAAYFAk78UXEACgkQgAnW8HDreRYB2wCePeRrRCFKj9JinjuqynY9Hyf5
+OYQAnjGKmzjvim4pFmNZQ4dox84Gv+mL
+=soFG
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-5.8.0.ebuild b/sci-libs/vtk/vtk-5.8.0.ebuild
index 82f8c513fdda..acdf229368df 100644
--- a/sci-libs/vtk/vtk-5.8.0.ebuild
+++ b/sci-libs/vtk/vtk-5.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.1 2011/12/27 18:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.2 2011/12/29 11:39:17 jlec Exp $
 
 EAPI=3
 
@@ -24,38 +24,42 @@ SLOT="0"
 IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tk theora tk threads video_cards_nvidia R X"
 
 RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2:2
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/mesa
+	media-libs/tiff
+	sci-libs/hdf5
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	examples? (
-			x11-libs/qt-core:4[qt3support]
-			x11-libs/qt-gui:4[qt3support] )
+		x11-libs/qt-core:4[qt3support]
+		x11-libs/qt-gui:4[qt3support] )
 	ffmpeg? ( virtual/ffmpeg )
 	java? ( >=virtual/jre-1.5 )
 	mpi? ( virtual/mpi[cxx,romio] )
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
 	postgres? ( dev-db/postgresql-base )
+	python? ( dev-python/sip )
 	qt4? (
-			x11-libs/qt-core:4
-			x11-libs/qt-gui:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-sql:4
-			x11-libs/qt-webkit:4 )
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+		x11-libs/qt-sql:4
+		x11-libs/qt-webkit:4
+		python? ( dev-python/PyQt4	)
+		)
 	tk? ( dev-lang/tk )
 	theora? ( media-libs/libtheora )
 	tk? ( dev-lang/tk )
-	R? ( dev-lang/R )
-	dev-libs/expat
-	dev-libs/libxml2:2
-	media-libs/freetype
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/mesa
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt"
+	R? ( dev-lang/R )"
 DEPEND="${RDEPEND}
 		java? ( >=virtual/jdk-1.5 )
 		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
@@ -63,6 +67,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/VTK
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.0-cg-path.patch
+	"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
+	"${FILESDIR}"/${P}-R.patch
+	"${FILESDIR}"/${PN}-5.6.0-odbc.patch
+	"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
+	"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
+	)
+
 pkg_setup() {
 	echo
 	einfo "Please note that the VTK build occasionally fails when"
@@ -76,21 +89,6 @@ pkg_setup() {
 	append-cppflags -D__STDC_CONSTANT_MACROS
 }
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-5.6.0-cg-path.patch \
-		"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \
-		"${FILESDIR}"/${P}-R.patch \
-		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
-		"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch \
-		"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
-
-	# Fix sure buffer overflow on some processors as reported by Flameyes in #338819
-	sed -e "s:CHIPNAME_STRING_LENGTH    (48 + 1):CHIPNAME_STRING_LENGTH    (79 + 1):" \
-		-i Utilities/kwsys/SystemInformation.cxx \
-		|| die "Failed to fix SystemInformation.cxx buffer overflow"
-}
-
 src_configure() {
 	# general configuration
 	local mycmakeargs=(
@@ -142,12 +140,12 @@ src_configure() {
 
 	use tk &&
 	mycmakeargs+=(
-		VTK_WRAP_TCL
-		VTK_WRAP_TK
-		VTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include
-		VTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
-		VTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include
-		VTK_TK_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
+		-DVTK_WRAP_TCL=ON
+		-DVTK_WRAP_TK=ON
+		-DVTK_TCL_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DVTK_TCL_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
+		-DVTK_TK_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DVTK_TK_LIBRARY="${EPREFIX}"/usr/$(get_libdir)
 	)
 
 	use theora &&