Version Bump, Fixes for ffmpeg, Fortify source, py-2.7; #362701, #350318, #344065, #338819, #334705, #327957

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

7 files changed, 610 insertions, 20 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 007a9f44ae15..0e0c9b51680e 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,15 @@
 # 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.82 2011/03/31 15:50:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.83 2011/04/16 11:04:30 jlec Exp $
+
+*vtk-5.6.1 (16 Apr 2011)
+*vtk-5.6.0-r3 (16 Apr 2011)
+
+  16 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
+  +vtk-5.6.0-r3.ebuild, +files/vtk-5.6.0-ffmpeg.patch, +vtk-5.6.1.ebuild,
+  +files/vtk-5.6.1-ffmpeg.patch:
+  Version Bump, Fixes for ffmpeg, Fortify source, py-2.7; #362701, #350318,
+  #344065, #338819, #334705, #327957
 
   31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> vtk-5.6.0-r2.ebuild:
   Depend on virtual/ffmpeg instead of media-video/ffmpeg.
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 408b27a47e8c..4292c23d98a8 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -8,22 +8,29 @@ AUX vtk-5.4.2-libpng14.patch 548 RMD160 14217aaaad0b1d44d25574084ee2d3c75d52fbec
 AUX vtk-5.6.0-R.patch 2463 RMD160 be1ca5c2bd56ce2bf14d23817c1fe69901503345 SHA1 c08a10926064536f06e405b57ece07738896787d SHA256 ffdb077883fd054a1daefa9f1a073877f4f00a5fd4f0fc5bb7021feae5ad2e97
 AUX vtk-5.6.0-boost-property_map.patch 547 RMD160 3ae309e296febc8a5c5d86795fd7766fe12dcdf8 SHA1 e97b4273d94c1647c959469f6f1829101fabb108 SHA256 de594eb23b9a7c18c4c6bb67b507dd627e580fcc7e2ba8c151da94bf2949d3f1
 AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9
+AUX vtk-5.6.0-ffmpeg.patch 1230 RMD160 50288650daec6834ff099d4af4b739297a1ea943 SHA1 592d2c73e5fda8845007766f7e7c1d5a63ebbec2 SHA256 18d4cbdb1c04b2d5e1fc0d350f653b15c4d1978a4ad601242f173c2282d6dd01
 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9
 AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA1 02022f5f345ccfe8a13d99201828edb0371d7cc5 SHA256 eca7a508fcd07eb6d40e609e3670d12ce2d2d39dda11b60f418acd279ca03c25
+AUX vtk-5.6.1-ffmpeg.patch 1227 RMD160 0de6b2a6510f7afbe625527e8b7c5b7e259f6829 SHA1 01bc4d42894926f7e61bff7fa2270b1a6eac8ffc SHA256 9bb10f76b0499139272546e1dd089a9ed9410b1ddbccbca700ba526206f17f59
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtk-5.6.0.tar.gz 20709970 RMD160 b7abf3b9bb14a3db81608c7aa2721935ae653295 SHA1 355209c485304f1b0feefcda3585d45217ffd230 SHA256 2987938ad906c5fd30ddbf60889f899d1dd8c61d80320c55ac1acadc00a95d3e
+DIST vtk-5.6.1.tar.gz 20780311 RMD160 ac1864c9604d843ab9c654c67109f4f1487acaee SHA1 6d4d0de3b468828f21f70c5af5e37f9412ee59c5 SHA256 007be00bae6c7c96f78ca9709516c993a4e3221d0b1762a7fe70e2abe407e86d
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
 DIST vtkDocHtml-5.6.0.tar.gz 103149113 RMD160 da6a562345c4c143470ddcc8b926820eec2a41cb SHA1 ce7c3ea6c6b674cef0bdd2c2aa036f576c61a477 SHA256 330ab1de0963bdcd0d0d1dbcd374a579874d867bff4b298d65d46855baf2d0c2
+DIST vtkDocHtml-5.6.1.tar.gz 103469987 RMD160 ca6790ab0542fc91db53cc31f4ad9c3c025442d3 SHA1 9ade3dbfa76a2ac5e48dcb89398d2ffe85096a76 SHA256 2b035356743c36d982074078b2298d987e62c908285333a588addfb126f89dbe
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
 DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf
+DIST vtkdata-5.6.1.tar.gz 77991728 RMD160 b77b5f6919beae406712b93cd333dd4fad5ff3d1 SHA1 7350863d6351a961c4813ad6e73f74428307cd35 SHA256 ad2f8c99940f07f3edcbf71d838717c5c55d252cc8a67e705620858adaaa66f2
 EBUILD vtk-5.4.2-r1.ebuild 6379 RMD160 f796f2c974ca58fe7b34b62057d832e76950e6d8 SHA1 46c2fbe8ef5730744bb655e042661810e942d9f5 SHA256 966efe98dc9a1a48fd3faab5e1e0ec4eae636d45773f2f7bd49f455a4e30474d
-EBUILD vtk-5.6.0-r2.ebuild 7253 RMD160 925ba0f24465b630fb7cf9b2c3de8d30ea86a65d SHA1 736dca94eaf4977fa2b1b3f4cde1a709f22e96ab SHA256 8ae053cfd0456f4aa18f2112d63d7ceb9d21522c0e1896be4b6ea8f82e675850
-MISC ChangeLog 13790 RMD160 45c20bdc22d5da6376dcd1258129eb64247a2c12 SHA1 4c719729ac005a498d115fbc6ea5609c32932f65 SHA256 2307f56fd15f2da31661628ef4165c253114b7eee657a61f3f454b70a7c162be
+EBUILD vtk-5.6.0-r2.ebuild 7152 RMD160 7ae37103759500ae82b2b3aa7356ca393d411db1 SHA1 daa8a9be15b6dd5878b69df702b7beaa2495aa99 SHA256 1ca8bb7f7017b724cc3f5f26e6ec58125aaca336a1b4d10f75d4b2090c8e7f9d
+EBUILD vtk-5.6.0-r3.ebuild 6961 RMD160 e4d0349494d7e7e6ef546e774fb62c4e43f04848 SHA1 e31eab3a605ef1e9a32dcf3e69d6c21379bf5bc9 SHA256 ae1bd20c1924431615c16e00e538703e78b3d88fc0684966d90cd74ff69dab85
+EBUILD vtk-5.6.1.ebuild 6993 RMD160 04b919f443755c641ac8de6260908a414c9ebf9f SHA1 82866888a7c73634bd6fac11a558bdecc9d173c7 SHA256 80cf899170d2496052d37d0a2abf17b5ccd03a32d63c38027e1b05acc1f21921
+MISC ChangeLog 14128 RMD160 2edac744c4f59f5fdc438aa0c04f88d6bad1acb2 SHA1 d57f362e25c9b4aaccd0168cdf1dc05343245296 SHA256 032e95dc43a7ac24946576ff37832e0a7a737b070093027d2fe108cc6a110b3c
 MISC metadata.xml 574 RMD160 ccd927f3a387710bbf53f3f0f88c971dc814c605 SHA1 8160c080306039e0b3b18ced75ae6b81b8590ddc SHA256 9a3ca872da01db519865e7753e9c0922fe56972f4d6e27cbf5622afd41d23300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2UokoACgkQHB6c3gNBRYcvwACgwWNNhgL4rGTlV4b7OllHUO9S
-MsYAoJfp4Y5rBCSR+2uyFfcfJ2IG2mpd
-=KXjM
+iEYEARECAAYFAk2pd8UACgkQgAnW8HDreRaktACfUC4lVb9tfuQdW2HoyummuUgZ
+Ha8AoMhZrvW/bARN6Z1krAuya5lTUr7M
+=jkb3
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch
new file mode 100644
index 000000000000..2b600c067bc9
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch
@@ -0,0 +1,42 @@
+ CMake/vtkFFMPEGTestAvAlloc.cxx   |    2 +-
+ CMake/vtkFFMPEGTestURLFClose.cxx |    2 +-
+ IO/vtkFFMPEGWriter.cxx           |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx
+index ad691e3..1025c22 100644
+--- a/CMake/vtkFFMPEGTestAvAlloc.cxx
++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavformat/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx
+index 0bf4314..8c1df58 100644
+--- a/CMake/vtkFFMPEGTestURLFClose.cxx
++++ b/CMake/vtkFFMPEGTestURLFClose.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavformat/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx
+index b109c08..e056418 100644
+--- a/IO/vtkFFMPEGWriter.cxx
++++ b/IO/vtkFFMPEGWriter.cxx
+@@ -22,7 +22,7 @@
+ 
+ extern "C" {
+ #ifdef VTK_FFMPEG_HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavformat/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
new file mode 100644
index 000000000000..0a347770b0e7
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
@@ -0,0 +1,42 @@
+ CMake/vtkFFMPEGTestAvAlloc.cxx   |    2 +-
+ CMake/vtkFFMPEGTestURLFClose.cxx |    2 +-
+ IO/vtkFFMPEGWriter.cxx           |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx
+index ad691e3..32489d5 100644
+--- a/CMake/vtkFFMPEGTestAvAlloc.cxx
++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavcodec/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx
+index 0bf4314..1c10a93 100644
+--- a/CMake/vtkFFMPEGTestURLFClose.cxx
++++ b/CMake/vtkFFMPEGTestURLFClose.cxx
+@@ -1,6 +1,6 @@
+ extern "C" {
+ #ifdef HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavcodec/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
+diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx
+index 52673ef..ffbb78f 100644
+--- a/IO/vtkFFMPEGWriter.cxx
++++ b/IO/vtkFFMPEGWriter.cxx
+@@ -22,7 +22,7 @@
+ 
+ extern "C" {
+ #ifdef VTK_FFMPEG_HAS_OLD_HEADER
+-# include <ffmpeg/avformat.h>
++# include <libavcodec/avformat.h>
+ #else
+ # include <libavformat/avformat.h>
+ #endif
diff --git a/sci-libs/vtk/vtk-5.6.0-r2.ebuild b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
index 92b235c6bebf..3cb3bb8b42c2 100644
--- a/sci-libs/vtk/vtk-5.6.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
@@ -1,17 +1,18 @@
 # 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.8 2011/03/31 15:50:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.9 2011/04/16 11:04:30 jlec Exp $
 
 EAPI="3"
+
 PYTHON_DEPEND="python? 2"
 
-inherit eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs cmake-utils
+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"
+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 )"
@@ -37,9 +38,9 @@ RDEPEND="
 			x11-libs/qt-opengl:4
 			x11-libs/qt-sql:4
 			x11-libs/qt-webkit:4 )
-	tcl? ( >=dev-lang/tcl-8.2.3 )
+	tcl? ( dev-lang/tcl )
 	theora? ( media-libs/libtheora )
-	tk? ( >=dev-lang/tk-8.2.3 )
+	tk? ( dev-lang/tk )
 	R? ( dev-lang/R )
 	dev-libs/expat
 	dev-libs/libxml2:2
@@ -57,8 +58,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 		java? ( >=virtual/jdk-1.5 )
 		boost? ( >=dev-libs/boost-1.40.0[mpi?] )
-		mpi? ( >=dev-util/cmake-2.8.1-r2 )
-		>=dev-util/cmake-2.6"
+		dev-util/cmake"
 
 S="${WORKDIR}"/VTK
 
@@ -72,17 +72,17 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 
 	use python && python_set_active_version 2
-	use qt4 && qt4_pkg_setup
 	append-cppflags -D__STDC_CONSTANT_MACROS
 }
 
 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
-	epatch "${FILESDIR}"/${P}-R.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
+	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
 	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
 		-i Wrapping/Tcl/pkgIndex.tcl.in \
 		|| die "Failed to fix tcl pkgIndex file"
diff --git a/sci-libs/vtk/vtk-5.6.0-r3.ebuild b/sci-libs/vtk/vtk-5.6.0-r3.ebuild
new file mode 100644
index 000000000000..b358d4637b83
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.6.0-r3.ebuild
@@ -0,0 +1,245 @@
+# 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.1 2011/04/16 11:04:30 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
+	# 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 VTKData data || die
+		doins -r 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
new file mode 100644
index 000000000000..93ae71e09401
--- /dev/null
+++ b/sci-libs/vtk/vtk-5.6.1.ebuild
@@ -0,0 +1,245 @@
+# 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.1.ebuild,v 1.1 2011/04/16 11:04:30 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}"/${PN}-5.6.0-cg-path.patch \
+		"${FILESDIR}"/${PN}-5.2.0-tcl-install.patch \
+		"${FILESDIR}"/${PN}-5.6.0-boost-property_map.patch \
+		"${FILESDIR}"/${PN}-5.6.0-libpng14.patch \
+		"${FILESDIR}"/${PN}-5.6.0-R.patch \
+		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
+		"${FILESDIR}"/${P}-ffmpeg.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 VTKData data || die
+		doins -r 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
+}