Use selected python ABI, #401839, patch by JTRiley; dropped old

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

6 files changed, 19 insertions, 744 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 90353d8036db..5d93c558e5b4 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/vtk
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.92 2011/12/29 13:28:51 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.93 2012/02/10 18:55:37 jlec Exp $
+
+  10 Feb 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2-r1.ebuild,
+  -vtk-5.6.0-r2.ebuild, -vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild,
+  vtk-5.8.0.ebuild:
+  Use selected python ABI, #401839, patch by JTRiley; dropped old
 
   29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild:
   Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297
diff --git a/sci-libs/vtk/vtk-5.4.2-r1.ebuild b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
deleted file mode 100644
index 2d75c18a95bf..000000000000
--- a/sci-libs/vtk/vtk-5.4.2-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.15 2011/03/02 21:00:54 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-inherit cmake-utils eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs
-
-# 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/doc/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg doc examples mpi patented python qt4 tcl tk threads"
-RDEPEND="mpi? ( || (
-					sys-cluster/openmpi
-					sys-cluster/mpich2[cxx] ) )
-	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? ( x11-libs/qt-core:4
-			x11-libs/qt-opengl:4
-			x11-libs/qt-gui:4
-			x11-libs/qt-sql )
-	examples? ( x11-libs/qt-core:4[qt3support]
-			x11-libs/qt-gui:4[qt3support] )
-	dev-libs/expat
-	dev-libs/libxml2:2
-	media-libs/freetype
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/tiff
-	virtual/opengl
-	x11-libs/libXmu"
-
-DEPEND="${RDEPEND}
-		java? ( >=virtual/jdk-1.5 )
-		boost? ( >=dev-libs/boost-1.40.0 )
-		>=dev-util/cmake-2.6"
-
-S="${WORKDIR}"/VTK
-
-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
-	use qt4 && qt4_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cg-path.patch
-	epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch
-	epatch "${FILESDIR}"/${P}-boost-property_map.patch
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-		-i Wrapping/Tcl/pkgIndex.tcl.in \
-		|| die "Failed to fix tcl pkgIndex file"
-}
-
-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=/usr/share/${PN}/data
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-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 tcl VTK_WRAP_TCL)
-		$(cmake-utils_use tk VTK_USE_TK)
-		$(cmake-utils_use threads VTK_USE_PARALLEL)
-		$(cmake-utils_use patented VTK_USE_PATENTED)
-		$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use mpi VTK_USE_MPI))
-
-	# 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+=(
-			-DVTK_WRAP_PYTHON=ON
-			-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-			-DPYTHON_LIBRARY=$(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_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON)
-	fi
-
-	if use qt4; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN}
-			-DDESIRED_QT_VERSION=4
-			-DQT_MOC_EXECUTABLE=/usr/bin/moc
-			-DQT_UIC_EXECUTABLE=/usr/bin/uic
-			-DQT_INCLUDE_DIR=/usr/include/qt4
-			-DQT_QMAKE_EXECUTABLE=/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
-		dodir /usr/share/${PN} || \
-			die "Failed to create data/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
-
-	if use python; then
-		python_mod_optimize vtk
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup vtk
-	fi
-}
diff --git a/sci-libs/vtk/vtk-5.6.0-r2.ebuild b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
deleted file mode 100644
index efa8356ec1ea..000000000000
--- a/sci-libs/vtk/vtk-5.6.0-r2.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.10 2011/04/25 09:51:24 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-
-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
-		examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )
-		doc? ( http://www.${PN}.org/doc/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tcl theora tk threads R"
-RDEPEND="
-	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 )
-	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 )
-	tcl? ( dev-lang/tcl )
-	theora? ( media-libs/libtheora )
-	tk? ( dev-lang/tk )
-	R? ( dev-lang/R )
-	dev-libs/expat
-	dev-libs/libxml2:2
-	media-libs/freetype
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/mesa
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt"
-
-DEPEND="${RDEPEND}
-		java? ( >=virtual/jdk-1.5 )
-		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
-		dev-util/cmake"
-
-S="${WORKDIR}"/VTK
-
-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_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cg-path.patch \
-		"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \
-		"${FILESDIR}"/${P}-boost-property_map.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-R.patch \
-		"${FILESDIR}"/${P}-odbc.patch \
-		"${FILESDIR}"/${PN}-5.6.1-gcc-46.patch
-	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-		-i Wrapping/Tcl/pkgIndex.tcl.in \
-		|| die "Failed to fix tcl pkgIndex file"
-}
-
-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
-		-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 patented VTK_USE_PATENTED)
-		$(cmake-utils_use qt4 VTK_USE_QT)
-		$(cmake-utils_use tcl VTK_WRAP_TCL)
-		$(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 R VTK_USE_GNU_R)
-		$(cmake-utils_use mysql VTK_USE_MYSQL)
-		$(cmake-utils_use postgres VTK_USE_POSTGRES)
-		$(cmake-utils_use odbc VTK_USE_ODBC) )
-
-	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+=(
-			-DVTK_WRAP_PYTHON=ON
-			-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-			-DPYTHON_LIBRARY=$(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_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
-		dodir /usr/share/${PN} || \
-			die "Failed to create data/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
-
-	if use python; then
-		python_mod_optimize vtk
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup vtk
-	fi
-}
diff --git a/sci-libs/vtk/vtk-5.6.0-r3.ebuild b/sci-libs/vtk/vtk-5.6.0-r3.ebuild
deleted file mode 100644
index 2f1863dae7ca..000000000000
--- a/sci-libs/vtk/vtk-5.6.0-r3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r3.ebuild,v 1.3 2011/04/25 09:51:24 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-
-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
-		examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )
-		doc? ( http://www.${PN}.org/doc/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 tcl theora tk threads R"
-RDEPEND="
-	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 )
-	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 )
-	tcl? ( dev-lang/tcl )
-	theora? ( media-libs/libtheora )
-	tk? ( dev-lang/tk )
-	R? ( dev-lang/R )
-	dev-libs/expat
-	dev-libs/libxml2:2
-	media-libs/freetype
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/mesa
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt"
-
-DEPEND="${RDEPEND}
-		java? ( >=virtual/jdk-1.5 )
-		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
-		dev-util/cmake"
-
-S="${WORKDIR}"/VTK
-
-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_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cg-path.patch \
-		"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \
-		"${FILESDIR}"/${P}-boost-property_map.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-R.patch \
-		"${FILESDIR}"/${P}-odbc.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch \
-		"${FILESDIR}"/${PN}-5.6.1-gcc-46.patch
-	# Fix sure buffer overflow on some processors as reported by Flameyes in #338819
-	sed -e "s:CHIPNAME_STRING_LENGTH    (48 + 1):CHIPNAME_STRING_LENGTH    (79 + 1):" \
-		-i Utilities/kwsys/SystemInformation.cxx \
-		|| die "Failed to fix SystemInformation.cxx buffer overflow"
-	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
-		-i Wrapping/Tcl/pkgIndex.tcl.in \
-		|| die "Failed to fix tcl pkgIndex file"
-	# Patch FindPythonLibs.cmake for python-2.7, removing it does more harm than good.
-	sed -e "s:2.6 2.5 2.4 2.3 2.2 2.1 2.0:2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0:" \
-		-i CMake/FindPythonLibs.cmake || die "failed to patch for python 2.7"
-}
-
-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
-		-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 patented VTK_USE_PATENTED)
-		$(cmake-utils_use qt4 VTK_USE_QT)
-		$(cmake-utils_use tcl VTK_WRAP_TCL)
-		$(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 R VTK_USE_GNU_R)
-		$(cmake-utils_use mysql VTK_USE_MYSQL)
-		$(cmake-utils_use postgres VTK_USE_POSTGRES)
-		$(cmake-utils_use odbc VTK_USE_ODBC) )
-
-	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+=(
-			-DVTK_WRAP_PYTHON=ON
-			-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-			-DPYTHON_LIBRARY=$(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_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
-}
diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
index af6ff2a8bafb..e6ba94b36971 100644
--- a/sci-libs/vtk/vtk-5.6.1.ebuild
+++ b/sci-libs/vtk/vtk-5.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6.1.ebuild,v 1.6 2011/11/16 09:50:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.1.ebuild,v 1.7 2012/02/10 18:55:37 jlec Exp $
 
 EAPI="3"
 
@@ -168,8 +168,8 @@ src_configure() {
 	if use python; then
 		mycmakeargs+=(
 			-DVTK_WRAP_PYTHON=ON
-			-DPYTHON_INCLUDE_PATH=${EPREFIX}$(python_get_includedir)
-			-DPYTHON_LIBRARY=${EPREFIX}$(python_get_library)
+			-DPYTHON_INCLUDE_PATH="${EPREFIX}$(python_get_includedir)"
+			-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
 			-DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}")
 	fi
 
@@ -182,10 +182,10 @@ src_configure() {
 			-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)
+			-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
diff --git a/sci-libs/vtk/vtk-5.8.0.ebuild b/sci-libs/vtk/vtk-5.8.0.ebuild
index c7668f8a2c78..e57b7ffae8e6 100644
--- a/sci-libs/vtk/vtk-5.8.0.ebuild
+++ b/sci-libs/vtk/vtk-5.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.8.0.ebuild,v 1.3 2011/12/29 13:28:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.4 2012/02/10 18:55:37 jlec Exp $
 
 EAPI=3
 
@@ -178,6 +178,8 @@ src_configure() {
 			-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}")