Version bump (fixes bug #238883). Thanks much to Steve Yin <steve@chinavfx.net> for his ebuild.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-SENTINEL-2 i686

4 files changed, 282 insertions, 14 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 45de1a0bbe03..c8794cb8df00 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.49 2008/08/07 09:00:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.50 2008/10/02 23:37:56 markusle Exp $
+
+*vtk-5.2.0 (01 Oct 2008)
+
+  01 Oct 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.2.0.ebuild:
+  Version bump (fixes bug #238883). Thanks much to Steve Yin
+  <steve@chinavfx.net> for his ebuild.
 
   07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 7b4f85d53d73..9e095c6574db 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c
 DIST vtk-5.0.4-tcl8.5.patch.bz2 92930 RMD160 2fabbddda92f359204b830816b04a18bff553b87 SHA1 8be5de85b75241529b6c44d0197766db0f5d8ffa SHA256 b7125e09689a267334fbf89c173a9f5c6cc4e279baa6f00e11cbd2036afc101e
 DIST vtk-5.0.4.tar.gz 8344794 RMD160 9c9b3eb43c7425ba2e4fd40b75caae100c49a12c SHA1 da881bcb3e4cb6675cde00c4fe10e1dde81909c3 SHA256 f95f181d61b4af37157e733b4dee4f47c39804e987c2d033ecb81a82e53ecf84
+DIST vtk-5.2.0.tar.gz 16881520 RMD160 1924d366e8427364927bb94d09d57fbf9cc7164e SHA1 04e834ad5cabdff107c3a49e55b2419972ec0427 SHA256 b199c1280c296f0e9f86e41e601ea1427f631305a5c5d6dc8a85162ddc1937ac
+DIST vtkDocHtml-5.2.0.tar.gz 199649443 RMD160 08bc555b07b642db6e078cf91b5aa253fc7923ef SHA1 a0ef865576a7191497764380b8d51c60ce1ac9dc SHA256 94d1fdcb7bccac2f36e9a5c4e85aa65a7299a09105583ef34ed305cf1d753c81
 DIST vtkdata-5.0.3.tar.gz 22399159 RMD160 574afa369e58448641ec418bc4a046cb6c895eb9 SHA1 2fa9d63f95c6b294365b04912a780865f1eae9a8 SHA256 c46e6ac5728b44df3a150faf47cf3c144a3284e15bb29ff685bf4b182b1db32a
 DIST vtkdata-5.0.4.tar.gz 22403386 RMD160 af1fcadc568f15c230756bb9ee939159294b0c53 SHA1 18cccb3fdd2b78e505831b52317ec93eef42d5aa SHA256 030c4dcb5fe79ded8f046a5403a41c1f63884a6de1872c227faed5ad9a28ba99
+DIST vtkdata-5.2.0.tar.gz 30464776 RMD160 f079ffde387010dbd155dd9f1ac136215d459b33 SHA1 3e85ef88e371980a294a7752f04573b821d1b1c4 SHA256 d61171c1debb3212e0f62694faf8f2968721f00f1812d5eddb77d8fdab8d9229
 EBUILD vtk-5.0.3.ebuild 9099 RMD160 af206b44baf110292be7651ea3c4676c8b5cca65 SHA1 ba58db375e2d3d09ddf4fba53235c161dd4ccfab SHA256 ed00e3099fe57e93166f344060a3e321d2f6fda059e15424b2b367ac431d0927
 EBUILD vtk-5.0.4.ebuild 9141 RMD160 e9784463073b1722c509781a2d751b4f6d9e39f6 SHA1 826dda44a0d1dff821ca0a514ecb8632b3c5fa77 SHA256 6c124c6a1d369b985a7a3bd1e903449149dc8fee3e1cba37f482440f0bae61fb
-MISC ChangeLog 8440 RMD160 f913a74d759e6f93f27c87cb248f6f4e49615df2 SHA1 92a397cfb12b699a1fa190f4dd4b5b0ef94556cd SHA256 c91f6f6929961d27bf462a90e4d2a6f5f0859b197ea69fdbac39134020329202
-MISC metadata.xml 336 RMD160 cfe0e455785f509028bb91266f61e93bc1dbf8e8 SHA1 f4fe7e767e8d1d7152db7d006329bf3e7da450c8 SHA256 be67cd8dea328f98cdcaa58c0d671fecc73c0d0319d755b4feb53ecc43673085
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiaub8ACgkQOeoy/oIi7uwN0wCdFbe5NfvEGzg8UHdzIrn9iZK3
-vaoAn03M4+WdKf8ZUTygywbh7+uyZsJN
-=0nmF
------END PGP SIGNATURE-----
+EBUILD vtk-5.2.0.ebuild 9611 RMD160 1fc0da144016d53fff06b43d8eeac92b7c100f1d SHA1 6586419e69fe1ff9a73a09177c87cea48b7129d1 SHA256 6f01fedf0a4c28c6681911571b2b5a8b26ae07dae9ea51fccf4f78c5086c3d87
+MISC ChangeLog 8644 RMD160 7b5066f1760441ebcd1a559889f4a5088dcd7887 SHA1 4783a3b9e97b61db1e9113a8118b6995b60896ff SHA256 aaab7b67230242e6a131ed77108242e99542f060d9f8d3748fecdcfd12dac0c0
+MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 150f7780fb42..c3f48289d643 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -8,6 +8,8 @@
   <name>Markus Dittrich</name>
 </maintainer>
 <use>
-  <flag name='patented'>Build patented classes</flag>
+	<flag name='patented'>Build patented classes</flag>
+	<flag name='boost'>Add support for boost</flag>
+	<flag name='cg'>Use nvidia's cg shaders</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-libs/vtk/vtk-5.2.0.ebuild b/sci-libs/vtk/vtk-5.2.0.ebuild
new file mode 100644
index 000000000000..e5683d569ad5
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.2.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.2.0.ebuild,v 1.1 2008/10/02 23:37:56 markusle Exp $
+
+EAPI="1"
+inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4
+
+# 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
+		examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )
+		doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg doc examples mpi patented python tcl tk threads qt3 qt4"
+RDEPEND="mpi? ( || (
+					sys-cluster/openmpi
+					sys-cluster/lam-mpi
+					sys-cluster/mpich2 ) )
+	python? ( >=dev-lang/python-2.0 )
+	boost? ( dev-libs/boost )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	tcl? ( >=dev-lang/tcl-8.2.3 )
+	tk? ( >=dev-lang/tk-8.2.3 )
+	java? ( >=virtual/jre-1.5 )
+	!qt4? ( qt3? ( >=x11-libs/qt-3.3.4:3 ) )
+	qt4? (
+	|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) =x11-libs/qt-4.3*:4 ) )
+	dev-libs/expat
+	dev-libs/libxml2
+	media-libs/freetype
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/tiff
+	virtual/opengl
+	x11-libs/libXmu"
+
+DEPEND="${RDEPEND}
+		java? ( >=virtual/jdk-1.5 )
+		>=dev-util/cmake-2.2.3"
+
+S="${WORKDIR}"/VTK
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	if use qt3 && use qt4; then
+		echo
+		ewarn "qt3 and qt4 support for vtk are mutually exclusive and"
+		ewarn "qt4 support has therefore been enabled by default."
+		echo
+	fi
+
+	if use mpi && has_version sys-cluster/mpich2; then
+		append-flags -DMPICH_IGNORE_CXX_SEEK
+		if ! built_with_use sys-cluster/mpich2 cxx; then
+			die "Please re-emerge sys-cluster/mpich2 with USE=\"cxx\""
+		fi
+	fi
+
+	if use qt4 && use examples; then
+		QT4_BUILT_WITH_USE_CHECK="qt3support"
+		qt4_pkg_setup
+	fi
+}
+
+src_compile() {
+	# gcc versions 3.2.x seem to have sse-related bugs that are
+	# triggered by VTK when compiling for pentium3/4
+	if [ "$(gcc-major-version)" -eq 3 -a "$(gcc-minor-version)" -eq 2 -a \
+		"$(get-flag -march)" == "-march=pentium4" ]; then
+		filter-mfpmath sse
+		filter-flags "-msse -msse2"
+		echo "$(get-flag -march)"
+	fi
+
+	# Fix Examples cmake file
+	sed -e "s/MAKEPROGRAM/CMAKE_MAKE_PROGRAM/g" \
+		-i "${S}"/Examples/CMakeLists.txt || \
+		die "Failed to fix examples CMakeList.txt"
+
+	# build list of config variable define's to pass to cmake
+	local CMAKE_VARIABLES=""
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DIR:PATH=${S}"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_LIB_DIR:PATH=/$(get_libdir)/"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_JPEG:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_PNG:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_TIFF:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_ZLIB:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_EXPAT:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_TESTING:BOOL=OFF"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_HYBRID:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_GL2PS:BOOL=ON"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_RENDERING:BOOL=ON"
+
+	use boost && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_BOOST:BOOL=ON"
+	use cg && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_CG_SHADERS:BOOL=ON"
+
+	use examples && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DATA_ROOT:PATH=/usr/share/${PN}/data -DBUILD_EXAMPLES:BOOL=ON"
+	if use java; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_JAVA:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_INCLUDE_PATH:PATH=`java-config -O`/include"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux"
+		if [ "${ARCH}" == "amd64" ]; then
+			CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/${ARCH}/libjawt.so"
+		else
+			CMAKE_VARIABLES="${CMAKE_VARIABLES} -DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so"
+		fi
+	fi
+
+	if use mpi; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_MPI:BOOL=ON"
+		use !threads && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PARALLEL:BOOL=ON"
+	fi
+
+	if use python; then
+		python_version
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_PYTHON:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_INCLUDE_PATH:PATH=/usr/include/python${PYVER}"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DPYTHON_LIBRARY:PATH=/usr/$(get_libdir)/libpython${PYVER}.so"
+	fi
+
+	if use qt3 || use qt4 ; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_GUISUPPORT:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_QVTK:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_CPP:BOOL=ON"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_WRAP_UI:BOOL=ON"
+	fi
+
+	if use qt3; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins/${PN}"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=3"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/moc"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/qt/3/bin/uic"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/qt/3/include"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/qt/3/bin/qmake"
+	fi
+
+	if use qt4; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/$(get_libdir)/qt4/plugins/${PN}"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDESIRED_QT_VERSION:STRING=4"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_MOC_EXECUTABLE:FILEPATH=/usr/bin/moc"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_UIC_EXECUTABLE:FILEPATH=/usr/bin/uic"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_INCLUDE_DIR:PATH=/usr/include/qt4"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake"
+	fi
+
+	if use tcl; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=OFF"
+	fi
+
+	if use tk; then
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_TK:BOOL=ON"
+	else
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_TK:BOOL=OFF"
+	fi
+
+	use threads && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PARALLEL:BOOL=ON"
+	use patented && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_USE_PATENTED:BOOL=ON"
+	use doc && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DDOCUMENTATION_HTML_HELP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON"
+
+	# run cmake twice to achieve proper
+	# configuration with cmake 2.2.x
+	cmake ${CMAKE_VARIABLES} . && cmake ${CMAKE_VARIABLES} . \
+		|| die "cmake configuration failed"
+
+	# fix java.lang.OutOfMemoryError on amd64 (see bug #123178)
+	if use java && [ "${ARCH}" == "amd64" ]; then
+		sed -e "s/javac/javac -J-Xmx256m/" \
+		-i "${S}"/Wrapping/Java/CMakeFiles/VTKBuildAll.dir/build.make \
+		|| die "Failed to patch javac"
+	fi
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# remove portage paths from dynamically created Type
+	# headers
+	sed -e "s:${S}/Common/::" \
+		-e "s:${S}/Rendering/::" \
+		-i "${S}"/Utilities/InstallOnly/*.cmake || \
+		die "Failed to fix cmake files"
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# install docs
+	dohtml "${S}"/README.html || die "Failed to install docs"
+
+	# install python modules
+	if use python; then
+		cd "${S}"/Wrapping/Python
+		docinto vtk_python
+		distutils_src_install
+	fi
+
+	# install jar
+	use java && java-pkg_dojar "${S}"/bin/vtk.jar
+
+	# install Tcl docs
+	docinto vtk_tcl
+	dodoc "${S}"/Wrapping/Tcl/README || \
+		die "Failed to install Tcl docs"
+
+	# install examples
+	if use examples; then
+		dodir /usr/share/${PN} || \
+			die "Failed to create examples directory"
+		cp -pPR "${S}"/Examples "${D}"/usr/share/${PN}/examples || \
+			die "Failed to copy example files"
+
+		# fix example's permissions
+		find "${D}"/usr/share/${PN}/examples -type d -exec \
+			chmod 0755 {} \; || \
+			die "Failed to fix example directories permissions"
+		find "${D}"/usr/share/${PN}/examples -type f -exec \
+			chmod 0644 {} \; || \
+			die "Failed to fix example files permissions"
+
+		cp -pPR "${WORKDIR}"/VTKData "${D}"/usr/share/${PN}/data || \
+			die "Failed to copy data files"
+
+		# fix data's permissions
+		find "${D}"/usr/share/${PN}/data -type d -exec \
+			chmod 0755 {} \; || \
+			die "Failed to fix data directories permissions"
+		find "${D}"/usr/share/${PN}/data -type f -exec \
+			chmod 0644 {} \; || \
+			die "Failed to fix data files permissions"
+	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
+	echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> "${T}"/40${PN}
+	echo "VTK_DIR=/usr/$(get_libdir)/${PN}-${SPV}" >> "${T}"/40${PN}
+	echo "VTKHOME=/usr" >> "${T}"/40${PN}
+	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
+}