Version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 270 insertions, 2 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 8a7895ee59e4..bebda0577a51 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2008/02/29 14:47:41 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.42 2008/03/07 02:13:31 markusle Exp $
+
+*vtk-5.0.4 (06 Mar 2008)
+
+  06 Mar 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.4.ebuild:
+  Version bump.
 
   29 Feb 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
   Fixed bogus install location (see bug #211819). Thanks much to
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 988079026f17..f2120a100822 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,9 @@
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c
+DIST vtk-5.0.4.tar.gz 8344794 RMD160 9c9b3eb43c7425ba2e4fd40b75caae100c49a12c SHA1 da881bcb3e4cb6675cde00c4fe10e1dde81909c3 SHA256 f95f181d61b4af37157e733b4dee4f47c39804e987c2d033ecb81a82e53ecf84
 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
 EBUILD vtk-5.0.3.ebuild 9115 RMD160 da8ef8fb2d3dcc2270e6b61ea6fbe1048d4cd07e SHA1 9f80346437e0a8264c1b4bf6dc65b4298fa27c98 SHA256 b67e1fc4f7c5a9ea9db9c8f52ee50d1c0467bfa493f7cb656db989a9f8a0fbdc
-MISC ChangeLog 7230 RMD160 1004baab5bcc8bc178828dc97e2058c71a1f5b26 SHA1 024fa25c7567f349b91b7ddd192fbe0a34b294c5 SHA256 503bdb77ed4dd73a14198acf630e0d9f96f588662d8743b12d8edec6f5276c94
+EBUILD vtk-5.0.4.ebuild 9121 RMD160 fdc67545676d8480bd9852bb361f9d22ba794a58 SHA1 e806f204c253938e58b549d5b55ee4f8b8d4377e SHA256 be7defaf484500d0188b1f9edd808a4df4371e4b087e132c11a9f71605b17c55
+MISC ChangeLog 7345 RMD160 354b6ef8ae2feefddeb63773dde58a501fa442f9 SHA1 fb0b2f94f769f1e9c6d3c1215955f744a6705e68 SHA256 e47501a2ae12f0cb990e831a030a5f8511e8fe05bcbc37d39f2b6492106eec87
 MISC metadata.xml 273 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec SHA1 852b5371f1bb0b4d5c4934f75b434e8f252533b7 SHA256 b930aead56cb1a6abb648c097836b6e8bf08c1ffa2038ad071aa1c98d1602e56
diff --git a/sci-libs/vtk/vtk-5.0.4.ebuild b/sci-libs/vtk/vtk-5.0.4.ebuild
new file mode 100644
index 000000000000..5263735dd18d
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.0.4.ebuild
@@ -0,0 +1,260 @@
+# 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.0.4.ebuild,v 1.1 2008/03/07 02:13:31 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 )"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="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 )
+	tcl? ( >=dev-lang/tcl-8.2.3 )
+	tk? ( >=dev-lang/tk-8.2.3 )
+	java? ( >=virtual/jre-1.5 )
+	qt3? ( $(qt_min_version 3.3.4) )
+	qt4? ( $(qt4_min_version 4.1) )
+	dev-libs/expat
+	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
+
+	use qt4 && use examples && \
+		if ! built_with_use =x11-libs/qt-4* qt3support; then
+			echo
+			eerror 'Please emerge qt4 with USE="qt3support" to'
+			eerror 'build the examples under qt4!'
+			die "qt4 setup error"
+		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
+
+	use qt4 && qt4_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-5.0.3-mpi.patch
+}
+
+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_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} -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 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 -j1 || 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
+
+	# environment
+	echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> "${T}"/40${PN}
+	echo "VTK_DIR=/usr/lib/${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
+}