Version bump.

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 263 insertions, 5 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 488c85956e64..aa667e9f0778 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.26 2006/11/18 15:49:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.27 2006/12/02 15:01:23 markusle Exp $
+
+*vtk-5.0.2 (02 Dec 2006)
+
+  02 Dec 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.2.ebuild:
+  Version bump.
 
   18 Nov 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild:
   Added -j1 back to ebuild since some people still experience problems
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 9da7d6893239..f7501134b066 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -8,8 +8,10 @@ RMD160 29e308fb44d79c8f204c47e508da909a390637af files/vtk-qt-gentoo.patch 593
 SHA256 7976a5a10bb8f9621077841f8582fcc309837976266f353b3a3e9880d208eefd files/vtk-qt-gentoo.patch 593
 DIST vtk-5.0.0.tar.gz 8305569 RMD160 5aec714c4d30ff0d60e0e89454345b176dc1fd18 SHA1 d0715c55aa35307d605642587240423a98b86b6a SHA256 335e7272ab6a35bbf9acba8db19a12507a705f75990099c2303bd83658d8bb6c
 DIST vtk-5.0.1.tar.gz 8338236 RMD160 96874bf9ffc4162ae2a67018d8f8ccc32a529c7c SHA1 613d18576503acd9ebacec40683aa427622fc6e7 SHA256 1f7f6bb4df16e2c64a4493dd758b1de5fc6bf9260b7c5e96d316ad0da5fcfeff
+DIST vtk-5.0.2.tar.gz 8339510 RMD160 81b22986a31203e0d9434a159b2470936147a59f SHA1 0a574f481c65a3d188c48dfc4e284aa8f70bad84 SHA256 045f71e609f14877a1dc59cb9b2d697565ae727fdeab09d76a7c62d4a1f4421d
 DIST vtkdata-5.0.0.tar.gz 22368991 RMD160 0ace18af83e4de48721ae0be8e04dec8dbac94f4 SHA1 ffd5e9d2a4f5d4a7dbf342d5f645bf46c4787653 SHA256 72e2b590d6aa5eeaa5b9ce8c90df76ba3f50cdd6b2c1e3923eb14faa1e8a35a4
 DIST vtkdata-5.0.1.tar.gz 22397812 RMD160 892777c3a5cda139f2843488a22c8628208e6306 SHA1 51f93126c0ffa9dc0582c13d336fb770b38a5428 SHA256 05080dd5c1edcb33edaa55bce13667c0fdaf35e8e679d9c0be76eecc35f1d7db
+DIST vtkdata-5.0.2.tar.gz 22397793 RMD160 93e649caaaef4e37aa4f9807c4d2b8420cd07cfd SHA1 ab853dfe0e8a48001a8db24d74799954965dffc3 SHA256 2a5f58d2fa5eb877ff5cc271baddec2e9ed90f83ba2d9b3ba46d7d1dc987c7f5
 EBUILD vtk-5.0.0.ebuild 8319 RMD160 b80bdacb3590b98e018002bd56ddcf68861d708e SHA1 3dc4987254bb1a115df4be2d3e887772af25a070 SHA256 8f34d2d81e54073598b1238f67516d0f423fa276168696bd2ebe023d2fd271d9
 MD5 57148df90a09df938d3fe860da810668 vtk-5.0.0.ebuild 8319
 RMD160 b80bdacb3590b98e018002bd56ddcf68861d708e vtk-5.0.0.ebuild 8319
@@ -18,10 +20,14 @@ EBUILD vtk-5.0.1.ebuild 8408 RMD160 e3a86ff058bc4e1431df318e22e07c4a1b1b3f8c SHA
 MD5 46a89aee9de0e18640e8144fac7107eb vtk-5.0.1.ebuild 8408
 RMD160 e3a86ff058bc4e1431df318e22e07c4a1b1b3f8c vtk-5.0.1.ebuild 8408
 SHA256 a14ae5e0ba087e1605bb66232b8e11e4ec36dd10819288c36a8ca413b3e3267b vtk-5.0.1.ebuild 8408
-MISC ChangeLog 4858 RMD160 5e3a64f9595dd651ddb2d1e431e8e61241f8acb6 SHA1 00c5087133ec3c961bc249beb5c522af305bbcd1 SHA256 3dffad51c66ef5f90361512ef37a57eebe05e16ceaecdce7bfce9613d3d7c9c1
-MD5 f8e3701c4958722b849c80e8c8f3dc37 ChangeLog 4858
-RMD160 5e3a64f9595dd651ddb2d1e431e8e61241f8acb6 ChangeLog 4858
-SHA256 3dffad51c66ef5f90361512ef37a57eebe05e16ceaecdce7bfce9613d3d7c9c1 ChangeLog 4858
+EBUILD vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 SHA1 dee67adb3346742815e70a119a30fe4ec0df96a9 SHA256 4001ba54ffe6c8fc2291d527b8f6d5f68a01d4cbd1e7767085efd98b00374c44
+MD5 3ab1a3c117bfaf08a05d31daed7b4518 vtk-5.0.2.ebuild 8371
+RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 vtk-5.0.2.ebuild 8371
+SHA256 4001ba54ffe6c8fc2291d527b8f6d5f68a01d4cbd1e7767085efd98b00374c44 vtk-5.0.2.ebuild 8371
+MISC ChangeLog 4973 RMD160 66515a189c4493426e18e7b56df0f49839e682e7 SHA1 0b558ef377d363ca65991f83a3e914a12b18f173 SHA256 b887e93194fa064d87f07d746b19f435ca52fe871c6804f1725edae0cfd37a4f
+MD5 08ecf8bb593ab3fb95e5d451c69f2aca ChangeLog 4973
+RMD160 66515a189c4493426e18e7b56df0f49839e682e7 ChangeLog 4973
+SHA256 b887e93194fa064d87f07d746b19f435ca52fe871c6804f1725edae0cfd37a4f ChangeLog 4973
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
@@ -32,3 +38,6 @@ SHA256 3a6c9807913e0fa464e7a1c161d111b61a9210522f75014765c4440bb39fa486 files/di
 MD5 deb493f98779a365e72fa1438e9c4ec4 files/digest-vtk-5.0.1 479
 RMD160 e042cdaebb396cdeff3a3ed663e9e8de28bc3486 files/digest-vtk-5.0.1 479
 SHA256 b180e1ee179e494d6cc1b4a8fe3f987295ee6f01cd52eea7016a4497a3d81fb4 files/digest-vtk-5.0.1 479
+MD5 b63aefed7133840a43a2f8465add74ca files/digest-vtk-5.0.2 479
+RMD160 20216a2f476d58729223ce009392aa37dc481a3d files/digest-vtk-5.0.2 479
+SHA256 0e1fc67835b6131e42c5c7784ee1ec5a49abcd6a66badef097a17a13a7d9bc10 files/digest-vtk-5.0.2 479
diff --git a/sci-libs/vtk/files/digest-vtk-5.0.2 b/sci-libs/vtk/files/digest-vtk-5.0.2
new file mode 100644
index 000000000000..6e87f4c9298e
--- /dev/null
+++ b/sci-libs/vtk/files/digest-vtk-5.0.2
@@ -0,0 +1,6 @@
+MD5 c2f439d1a4bc1598a1cb09ee43f794ed vtk-5.0.2.tar.gz 8339510
+RMD160 81b22986a31203e0d9434a159b2470936147a59f vtk-5.0.2.tar.gz 8339510
+SHA256 045f71e609f14877a1dc59cb9b2d697565ae727fdeab09d76a7c62d4a1f4421d vtk-5.0.2.tar.gz 8339510
+MD5 7ef629787a4d3411fe4b7912f6db604e vtkdata-5.0.2.tar.gz 22397793
+RMD160 93e649caaaef4e37aa4f9807c4d2b8420cd07cfd vtkdata-5.0.2.tar.gz 22397793
+SHA256 2a5f58d2fa5eb877ff5cc271baddec2e9ed90f83ba2d9b3ba46d7d1dc987c7f5 vtkdata-5.0.2.tar.gz 22397793
diff --git a/sci-libs/vtk/vtk-5.0.2.ebuild b/sci-libs/vtk/vtk-5.0.2.ebuild
new file mode 100644
index 000000000000..1c9f31b72746
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.0.2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.2.ebuild,v 1.1 2006/12/02 15:01:23 markusle Exp $
+
+# TODO: need to fix Examples/CMakeLists.txt to build other examples
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3
+
+# 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"
+KEYWORDS="~x86"
+SLOT="0"
+IUSE="doc examples mpi patented python tcl tk threads qt3 qt4"
+RDEPEND="java? ( =virtual/jdk-1.4* )
+	mpi? ( sys-cluster/mpich )
+	python? ( >=dev-lang/python-2.0 )
+	tcl? ( >=dev-lang/tcl-8.2.3 )
+	tk? ( >=dev-lang/tk-8.2.3 )
+	dev-libs/expat
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/tiff
+	virtual/opengl
+	|| ( x11-libs/libXmu virtual/x11 )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/cmake-2.2.3
+		qt3? ( $(qt_min_version 3.3.4) )
+		qt4? ( >=x11-libs/qt-4.1.0 )"
+
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-5.0.1-python2.5-gentoo.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} -DCMAKE_INSTALL_PREFIX:PATH=/usr"
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_SHARED_LIBS: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"
+
+	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}
+	if use java; then
+		echo "CLASSPATH=/usr/share/${PN}/lib/${PN}.jar" >> ${T}/40${PN}
+	fi
+	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
+}