sci-libs/vtk: Version Bump

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 295 insertions, 19 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index b78c896e80c1..4ff7f2e2c916 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.100 2012/12/06 19:36:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.101 2012/12/13 12:09:46 jlec Exp $
+
+*vtk-5.10.1 (13 Dec 2012)
+
+  13 Dec 2012; Justin Lecher <jlec@gentoo.org> +vtk-5.10.1.ebuild,
+  metadata.xml:
+  Version Bump
 
   06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> vtk-5.10.0.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index ecfdfac30630..cbc67012e0d7 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -18,15 +18,19 @@ AUX vtk-5.6.1-libpng15.patch 686 SHA256 4d651b007b91882b676172e069a4d86479045a10
 AUX vtk-5.8.0-R.patch 2127 SHA256 a1be40bbc17704a614f929a4101df34ee7c327da09ee2eaee27468a9b55bb794 SHA512 957c6c0cc9203d090d530f78e7971d6f45c6d38ebb4ee82f60d79cdeea61c1a289d2826496a91bbf076f3e27cc9e328a351d56ca786839afe541afa095998c42 WHIRLPOOL 1a849f18eb102073d443932b42ef90cac73f87b787e898c50389f2418a524742180667ae37ddd420d4169aed98f0a5b698bc408c0be31bd1ca3577d11341f0e2
 AUX vtk-5.8.0-boost.patch 1264 SHA256 2611eb61261328f8b4a9f2721baade85554ebc91a7053fd78b9e7eb0500d981e SHA512 232ad44b456656d6bbcaf215a59eae4ec2c4df35f39055d24270f956d81bfc91a93090938ddd1ee5c677c5422d9eb4931c0f8fa325e860bccba163608441460b WHIRLPOOL 5f2fc86108a5bc54b92f311d3302fe1bb58bf7f3119d599f6d491e64b030624f0183b79fa50a29e11210284a2adee925a8e61509015da068930a2a8154a6bf1b
 DIST vtk-5.10.0.tar.gz 24803686 SHA256 9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392 SHA512 8603098fa316fa86f624cf05eed3882158aaf098fe371754fec93fe96ebbf965a5315b3bfc34784f8adb0b46a545bd326c80e11e11157f3f96d33b36fb177554 WHIRLPOOL b7265e7e2430ad1de90987f8c54c130734d603f27e806a7666a292334e6feb43b4883e68b77004b9c1eb9bfe488db59ccf89052745e1f68153d7bd3bfabdb43f
+DIST vtk-5.10.1.tar.gz 24804193 SHA256 f1a240c1f5f0d84e27b57e962f8e4a78b166b25bf4003ae16def9874947ebdbb SHA512 2e4ab39293620b553c91e2275a813ce88eaa39c7f4c3ec6041d88a71fa736ee38aad31ec66897440d4025d5c0933d16c1d421ac5b91cd8a362f6f2e6569bde22 WHIRLPOOL 4b7aef091b2a1d9c14b0f2ba9495b1809771c92c6c2c242ce3a723b43878f9c79d21214f6db8b16c726542f6375d8932c7ed50ceadc3a07724f6ecdb46492e0e
 DIST vtkDocHtml-5.10.0.tar.gz 176529461 SHA256 28d7e1bfc9f9a4d225d15b9f46cec18f89df106a161d0cee29fcc6f071d3b01a
+DIST vtkDocHtml-5.10.1.tar.gz 178278963 SHA256 1447d7e07a615c0c6d66cce2bfc6b2f4a6eaec03c132d13345d225ee6f309944 SHA512 c1c8bf1b3c94ab79b1661b3197788ded31c3aef5114d830866ed0a6dd90d3a6c50ed27cd7840a512065ad2b15fd8bcbc61787fbbd00216a1becb2419eb172735 WHIRLPOOL b3ba92938fb4894522c5b930767b4e4c11756e1aae1c100a42ab4a592f7d4a848ea1996b3956c26cb17cce4cb0fd43d8c92efec42a802e318439a653bcc398e9
 DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c
+DIST vtkdata-5.10.1.tar.gz 88642678 SHA256 c526a5eeb73693597043a89d401ef5b8f0c6f6eddb82e03ad205f013ee9edf7c SHA512 3655ecd4bd6f05e3266c19d67c59867e12d4681e159869b7673948a8ba3966f958bd1a1ef024321b66f3ad649b80fc62e5323f8bd700d34fdd95645e7fe5ef32 WHIRLPOOL b65e533dc3a092ae4944bfd1ca850ab3b7ba95c62c654e0c03ac8c689d4270eaf58ae91519200c00b94ad3108f4ce3bc16656bf62a7e10dc627dea736594831d
 EBUILD vtk-5.10.0.ebuild 7456 SHA256 0a8498310d4696e43a17ea5a10b313cdbe054cb4653fc2b49c6f6d19aa156cf4 SHA512 77084e58e99591259e745ba4f26836ae2bd22e8dc73ad69d8fbff4b2008e3e2de4ad0a751e2f4485c82ad961656a367fa2f8352b62d29613e385bebca8710f0e WHIRLPOOL 2187cb19aebe5b8eec92aac1b1a7acbd3fa3cdb04a93dffbc4badd70156ab8bf006264b08f7306e55ac1104bfb281cb14834354c65c5d71a20613851062c68c2
-MISC ChangeLog 16602 SHA256 ebf00b7cf5b81f45e666b6c302bdfcd992eb1df4ca7f14cd6358511b139261a5 SHA512 69a480681e34f6f7adae2942afa7bff388fde4bfb70f4aa91e4cdc5e88ca880e4caec8d381405291bfa9785833919a752d1e00c973ec7efa86b689237c164bb3 WHIRLPOOL 2a85c1c6e70d1bdd0478ff00c0a6f320432e2c1215e53b35e663e553005efc7cc3daadeec313d0d653434836b79484f4e716f35775ad8aa37b720b3c0e3b6504
-MISC metadata.xml 543 SHA256 d32dcd8318fa319b9d60f495679617c47d1159a3c692e591e035cb0ad578d117 SHA512 649f0d69b7072cc84d86751dcd5f94f491f637fd1cdd922fa71291bed2e52d86bf203f19b07031bd4a3058aa52b7d2a90e98fbd1f567fda740e9c008c273d6b2 WHIRLPOOL d481a49da74787fb676b5bbc5dabd05acb036711b94139b772cadf79f1d2271e43a08c6b19f5c5f43362a8a758a52fb67ec6b8987f07afe7f6c01317c02eee29
+EBUILD vtk-5.10.1.ebuild 7457 SHA256 7605e840229cea2713786f269f51cd8b36c55f0a26d98c928cc5bd7b297581b7 SHA512 734c5f448485b21dfa23fda49f95de3aec3a78458154eee589c5f7bdf4de15c50597ac47b6d409549924a425c2dd59c6a3abbd622a6e280ee13ee20a187f15cd WHIRLPOOL 35ad6379907e6eaf51150c8686e83e4f0e43d7c6e0902296203d6b7f757600105aab58aecf4826749471ae4a3e3729c070be499ec72083c3161ef3efe0f1e162
+MISC ChangeLog 16724 SHA256 5f6b1a7510fc4c9cb1b158172eba905e2d43e0781eab1db474a08bd2bab01505 SHA512 fb3322fe21b4e2779d989bb3b49f1bc03d9f5109c6d43df8bac40ed7b5a3f161248f4d733c305d50bb8c4d8d1af93b0a6204765b6792808c953882a86ca1b97b WHIRLPOOL c3a7dd4ae984f53678ddcfbe851eca1dd9319008ddcee11a07cdc582130433d09242e487f93fa2e1ba49cf6464ea9d11ac2dc233c9eb2d508f1d678a98c13fe6
+MISC metadata.xml 563 SHA256 2fedd09c2e8b8c709641c6490e9b4ea9190d4c98cafa958386ed957bc8687ce9 SHA512 cb5a7f2db34a3e35a7115240ad21fce20bf771613dc42fe57c8e0ea1d004ea40e06fb57970285ebcca290bb390b29c10d7aa5d20a3df7e8dfeb314db152c3152 WHIRLPOOL 2540838d0c619af440b8269a46c58045cb6c79e73525b75ea891af381f7561c106712a1881c62cd0d4de7ddd7cc6926ab7c5a7ea59adfa7ebfb312dd1712ec45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDA86MACgkQ1ycZbhPLE2AevQCfawLa0jRv3GauXd06wivg4RB2
-CGYAnA91yQLYtYzDHT0TkIPIhZyhnsaQ
-=PVQY
+iEYEAREIAAYFAlDJxYsACgkQgAnW8HDreRaL4QCbBcAvHC5a10+e4d78OJUlrEPJ
+hdkAniQL1DI/wHsNyZ2UTdPAbNXDwH76
+=m0Mv
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 33d9753cf24d..d61334b677ae 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<herd>java</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
-	<use>
-		<flag name="boost">Add support for boost</flag>
-		<flag name="chemistry">Add chemistry support</flag>
-		<flag name="cg">Use nvidia's cg shaders</flag>
-		<flag name="patented">Build patented classes</flag>
-		<flag name="R">Enable support for dev-lang/R</flag>
-	</use>
+  <herd>sci</herd>
+  <herd>java</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <use>
+    <flag name="boost">Add support for boost</flag>
+    <flag name="chemistry">Add chemistry support</flag>
+    <flag name="cg">Use nvidia's cg shaders</flag>
+    <flag name="patented">Build patented classes</flag>
+    <flag name="R">Enable support for dev-lang/R</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/vtk/vtk-5.10.1.ebuild b/sci-libs/vtk/vtk-5.10.1.ebuild
new file mode 100644
index 000000000000..92559af844cd
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.10.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.1 2012/12/13 12:09:46 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+WANT_CMAKE="always"
+
+inherit eutils flag-o-matic java-pkg-opt-2 python qt4-r2 versionator toolchain-funcs cmake-utils
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="http://www.vtk.org/"
+SRC_URI="
+	http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
+	doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
+	examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="boost chemistry cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R theora threads tk video_cards_nvidia 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] )
+	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
+		python? ( dev-python/PyQt4	)
+		)
+	tk? ( dev-lang/tk )
+	theora? ( media-libs/libtheora )
+	tk? ( dev-lang/tk )
+	video_cards_nvidia? ( media-video/nvidia-settings )
+	R? ( dev-lang/R )"
+DEPEND="${RDEPEND}
+		java? ( >=virtual/jdk-1.5 )
+		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
+		dev-util/cmake"
+
+S="${WORKDIR}"/VTK${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.0-cg-path.patch
+	"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
+	"${FILESDIR}"/${PN}-5.8.0-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"
+	einfo "using parallel make. Hence, if you experience a build"
+	einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first."
+	echo
+
+	java-pkg-opt-2_pkg_setup
+
+	use python && python_set_active_version 2
+	append-cppflags -D__STDC_CONSTANT_MACROS
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+		-DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV}
+		-DCMAKE_SKIP_RPATH=YES
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIB_DIR=/$(get_libdir)/
+		-DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
+		-DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include"
+		-DBUILD_TESTING=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DVTK_USE_HYBRID=ON
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_RENDERING=ON)
+
+	# use flag triggered options
+	mycmakeargs+=(
+		$(cmake-utils_use boost VTK_USE_BOOST)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
+		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use java VTK_USE_JAVA)
+		$(cmake-utils_use mpi VTK_USE_MPI)
+		$(cmake-utils_use mysql VTK_USE_MYSQL)
+		$(cmake-utils_use patented VTK_USE_PATENTED)
+		$(cmake-utils_use postgres VTK_USE_POSTGRES)
+		$(cmake-utils_use odbc VTK_USE_ODBC)
+		$(cmake-utils_use qt4 VTK_USE_QT)
+		$(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
+		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+		$(cmake-utils_use tk VTK_USE_TK)
+		$(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)
+		$(cmake-utils_use chemistry VTK_USE_CHEMISTRY)
+	)
+
+	use tk &&
+	mycmakeargs+=(
+		-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 &&
+	mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON)
+
+	# mpi needs the parallel framework
+	if use mpi && use !threads; then
+		mycmakeargs+=(-DVTK_USE_PARALLEL=ON)
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DVTK_WRAP_JAVA=ON
+			-DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include
+			-DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include
+			-DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux
+		)
+
+		if [ "${ARCH}" == "amd64" ]; then
+			mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so)
+		else
+			mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so)
+		fi
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
+			-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
+			-DVTK_WRAP_PYTHON=ON
+			-DVTK_WRAP_PYTHON_SIP=ON
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
+			-DPYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
+			-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
+			-DVTK_PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
+			-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
+	fi
+
+	if use qt4 ; then
+		mycmakeargs+=(
+			-DVTK_USE_GUISUPPORT=ON
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
+			-DDESIRED_QT_VERSION=4
+			-DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
+			-DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
+			-DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake")
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install docs
+	dohtml "${S}"/README.html || die "Failed to install docs"
+
+	# install Tcl docs
+	docinto vtk_tcl
+	dodoc "${S}"/Wrapping/Tcl/README || \
+		die "Failed to install Tcl docs"
+
+	# install examples
+	if use examples; then
+		insinto /usr/share/${PN}
+		mv -v Examples examples
+		doins -r examples || die
+		mv -v "${WORKDIR}"/{VTKData,data} || die
+		doins -r "${WORKDIR}"/data || die
+	fi
+
+	#install big docs
+	if use doc; then
+		cd "${WORKDIR}"/html
+		rm -f *.md5 || die "Failed to remove superfluous hashes"
+		einfo "Installing API docs. This may take some time."
+		insinto "/usr/share/doc/${PF}/api-docs"
+		doins -r ./* || die "Failed to install docs"
+	fi
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF
+	VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+	VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+	VTKHOME=${EPREFIX}/usr
+	EOF
+	doenvd "${T}"/40${PN}
+}
+
+pkg_postinst() {
+	if use patented; then
+		ewarn "Using patented code in VTK may require a license."
+		ewarn "For more information, please read:"
+		ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp"
+	fi
+
+	if use python; then
+		python_mod_optimize vtk
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup vtk
+	fi
+}