Version bump. This fixes bug #123178.

Package-Manager: portage-2.1_pre5-r3

4 files changed, 205 insertions, 4 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index c1a41cb2b029..b49ca1645711 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2006/02/26 19:06:49 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.11 2006/03/06 01:14:31 markusle Exp $
+
+*vtk-5.0.0 (05 Mar 2006)
+
+  05 Mar 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.0.ebuild:
+  Version bump. Many thanks to Toon Verstraelen 
+  <Toon.Verstraelen@UGent.be> and Sebastiaan 
+  <s.breedveld@erasmusmc.nl> for their ebuilds and patches.
+  This fixes bug #123178.
 
   26 Feb 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild:
   Added cmake command line flag to prevent insecure RUNPATHS 
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 723b350a175f..c89715eaea22 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,9 +1,12 @@
-MD5 d4866a739755596347c8dc6b9ffd9b58 ChangeLog 1628
-RMD160 49145a9e693563d473404ab8b53b3dfe37ab4b2d ChangeLog 1628
-SHA256 e5f24e476d430d748f0b35911da55435c27ba43858bf3303982fc2112c22fbbb ChangeLog 1628
+MD5 f3a6dbd79bb9ed07eef4adb6879248cc ChangeLog 1908
+RMD160 fe8634f59c3ab26f972245f61da29f1a626cd2d0 ChangeLog 1908
+SHA256 2c0a8aa76c493d62263ca0adb2a1d572e8b86ff77eed509434b5f8d85ec30499 ChangeLog 1908
 MD5 86f6e1d7f2496767255664ba61932a73 files/digest-vtk-4.2.6 759
 RMD160 0879e3bfe67d7d6b36190d07c36078b2dcff84a7 files/digest-vtk-4.2.6 759
 SHA256 0a311502f00b1cba50cdadff5a55d329ec6fe99441e6360b6e45b580e6fc4d5d files/digest-vtk-4.2.6 759
+MD5 d5b69fd9f59f78b6e311c0d8aa26837c files/digest-vtk-5.0.0 479
+RMD160 8776721f7471b276b1eafb6d19789003922001e3 files/digest-vtk-5.0.0 479
+SHA256 3a6c9807913e0fa464e7a1c161d111b61a9210522f75014765c4440bb39fa486 files/digest-vtk-5.0.0 479
 MD5 7ba663b347dd89aa7ca2f19e50641057 files/vtk-4.2.6-gcc34.patch 1739
 RMD160 de155e60a0021c47beca599650f9bb77c59f0db4 files/vtk-4.2.6-gcc34.patch 1739
 SHA256 74ccd68d643424093df8f2de213cc4d7ed67a832e2272bbf3d3ea8f7595b0018 files/vtk-4.2.6-gcc34.patch 1739
@@ -13,3 +16,6 @@ SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata
 MD5 748f5f3854a501ae6f6e0169dbd5dbde vtk-4.2.6.ebuild 5768
 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 vtk-4.2.6.ebuild 5768
 SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f vtk-4.2.6.ebuild 5768
+MD5 abffef214c348cbb7cf709d613a5728d vtk-5.0.0.ebuild 6460
+RMD160 e29c02255b2897267844fc6a5011e643a1eba9e2 vtk-5.0.0.ebuild 6460
+SHA256 34d35be72c75782531c2ac54d2af14a969249fd257e998d21679435fae3b9181 vtk-5.0.0.ebuild 6460
diff --git a/sci-libs/vtk/files/digest-vtk-5.0.0 b/sci-libs/vtk/files/digest-vtk-5.0.0
new file mode 100644
index 000000000000..34f78830df55
--- /dev/null
+++ b/sci-libs/vtk/files/digest-vtk-5.0.0
@@ -0,0 +1,6 @@
+MD5 98a9cd026fcea70291af9a42a44ebba9 vtk-5.0.0.tar.gz 8305569
+RMD160 5aec714c4d30ff0d60e0e89454345b176dc1fd18 vtk-5.0.0.tar.gz 8305569
+SHA256 335e7272ab6a35bbf9acba8db19a12507a705f75990099c2303bd83658d8bb6c vtk-5.0.0.tar.gz 8305569
+MD5 5d0ab094b60a640180be40a1540cffed vtkdata-5.0.0.tar.gz 22368991
+RMD160 0ace18af83e4de48721ae0be8e04dec8dbac94f4 vtkdata-5.0.0.tar.gz 22368991
+SHA256 72e2b590d6aa5eeaa5b9ce8c90df76ba3f50cdd6b2c1e3923eb14faa1e8a35a4 vtkdata-5.0.0.tar.gz 22368991
diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild
new file mode 100644
index 000000000000..e09396a040d8
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.0.0.ebuild
@@ -0,0 +1,181 @@
+# 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.0.ebuild,v 1.1 2006/03/06 01:14:31 markusle Exp $
+
+# TODO: need to fix Examples/CMakeLists.txt to build other examples
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg 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 java mpi patented python tcltk threads qt"
+RDEPEND="java? ( virtual/jdk )
+	mpi? ( sys-cluster/mpich )
+	python? ( >=dev-lang/python-2.0 )
+	>=dev-lang/tcl-8.2.3
+	>=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.0.6
+		qt? ( $(qt_min_version 3.3.4) )"
+
+S="${WORKDIR}"/VTK
+
+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_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so"
+		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"
+	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 qt; 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"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_QT_DIR:PATH=/qt/3/plugins"
+		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DESIRED_QT_VERSION:STRING=3"
+	fi
+
+
+	use tcltk && CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_WRAP_TCL:BOOL=ON"
+	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"
+
+	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
+
+	# 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
+}