summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-12-29 13:28:51 +0000
committerJustin Lecher <jlec@gentoo.org>2011-12-29 13:28:51 +0000
commit5c4f1e55a6a1d0dcc5bf65bf84f1b8b232dada35 (patch)
tree6e7121e0fb6562b8098db162f1bd48d898c14428 /sci-libs
parentRun check-reqs_pkg_setup (diff)
downloadhistorical-5c4f1e55a6a1d0dcc5bf65bf84f1b8b232dada35.tar.gz
historical-5c4f1e55a6a1d0dcc5bf65bf84f1b8b232dada35.tar.bz2
historical-5c4f1e55a6a1d0dcc5bf65bf84f1b8b232dada35.zip
Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/vtk/ChangeLog5
-rw-r--r--sci-libs/vtk/Manifest10
-rw-r--r--sci-libs/vtk/vtk-5.8.0.ebuild5
3 files changed, 12 insertions, 8 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 8d229e38608e..90353d8036db 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.91 2011/12/29 11:39:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.92 2011/12/29 13:28:51 jlec Exp $
+
+ 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
+ Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297
29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
Add missing deps for hdf5 and PyQt4/sip support
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index b0dcca66f371..a1fd42a65a2a 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 7013 RMD160 8225c80eaffdb5e096583f9e29126b03a56e0a59 SHA1 c0e9293560afc9eab32ffaedec1f9b17e1c47f60 SHA256 7bd3d238cb638980898bc09f1b0de58b678482d281cbfb5658efe57c1c389bf7
-MISC ChangeLog 15323 RMD160 0647dd13e2d58a94b39ae3f0eb9f7bb86e4965f2 SHA1 012b128775c059ff81f4fa805402815c0beba6f3 SHA256 74d2d20e8fadb5ea7ad759db5471c6c295476e3d37c23abf27f6ef5f7f2c5991
+EBUILD vtk-5.8.0.ebuild 7059 RMD160 e6dfc035ab5d2cd01ee51dde8c5fb1f9125b60fb SHA1 34276ca0897b3b39234cda1a8aa17f6abcb4cacb SHA256 e8b4d9ccf8a96dd53a62a23ff95c6907f64cbae328eec0a859d00399a240af0b
+MISC ChangeLog 15451 RMD160 54e043f656c1b61f76df66d31949151227f9e90d SHA1 c650e1da14e71f3a0102e711b4761a68dde5e029 SHA256 75146b24c90446c10f2bfee019012e99c86c909496db3d6e392d53dc31883d2b
MISC metadata.xml 489 RMD160 1bf8f7af20c7e220d6ac248966c4b4eca7f807ac SHA1 cc32ba8468c91494fcbaccdd0f8373259ca6e74b SHA256 16006ed96a705ea53dd5839112d5f9556c00cf830a058bdb2492f8aa55439de6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEAREKAAYFAk78UXEACgkQgAnW8HDreRYB2wCePeRrRCFKj9JinjuqynY9Hyf5
-OYQAnjGKmzjvim4pFmNZQ4dox84Gv+mL
-=soFG
+iEYEAREKAAYFAk78ax4ACgkQgAnW8HDreRaFVACaAy4hXSYtpr57JAaQ0Tmzwa1Q
+d7sAoI0lN4p4YdFnr5HEtZBXIFIRob5Z
+=ROLr
-----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/vtk-5.8.0.ebuild b/sci-libs/vtk/vtk-5.8.0.ebuild
index acdf229368df..c7668f8a2c78 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.2 2011/12/29 11:39:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.3 2011/12/29 13:28:51 jlec Exp $
EAPI=3
@@ -135,6 +135,7 @@ src_configure() {
$(cmake-utils_use threads VTK_USE_PARALLEL)
$(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
$(cmake-utils_use X VTK_USE_X)
+ $(cmake-utils_use X VTK_USE_GUISUPPORT)
$(cmake-utils_use R VTK_USE_GNU_R)
)
@@ -179,7 +180,7 @@ src_configure() {
-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
-DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
-DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
- -DPYTHON_SETUP_ARGS:STRING=--root="${D}")
+ -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
fi
if use qt4 ; then