Removed old version since it doesn't build any more. Also fixed permissions for the vtk-qt patch (see bug #146826).

Package-Manager: portage-2.1.1_rc1-r3

4 files changed, 8 insertions, 231 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 00afc1bbaab1..b8b871e3d8a3 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,22 +1,11 @@
-AUX vtk-4.2.6-gcc34.patch 1739 RMD160 de155e60a0021c47beca599650f9bb77c59f0db4 SHA1 2a96e9230efc08ba83acbc6b458d8a6db142eedc SHA256 74ccd68d643424093df8f2de213cc4d7ed67a832e2272bbf3d3ea8f7595b0018
-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
-AUX vtk-qt3-qt4-gentoo.patch 593 RMD160 2baf9667618a55f30aef5322a5d824ed0053be4b SHA1 8ef6299b849ef3a3d129221451ed5e7b95cb7a92 SHA256 fab69a77e7cb6dc28645cb81119c8908461045f4e428646fdf3ee9f2bc4034da
-MD5 70064ac33fde02a4c8e08e6dcc9ed987 files/vtk-qt3-qt4-gentoo.patch 593
-RMD160 2baf9667618a55f30aef5322a5d824ed0053be4b files/vtk-qt3-qt4-gentoo.patch 593
-SHA256 fab69a77e7cb6dc28645cb81119c8908461045f4e428646fdf3ee9f2bc4034da files/vtk-qt3-qt4-gentoo.patch 593
-DIST VTK-4.2-LatestRelease.tar.gz 6073644 RMD160 71a092cf929cfaeeb8f297334cadb829209b9ad7 SHA1 31ab01c16b3d44ce201d8180af431833cf6527d8 SHA256 0ba6513a1acf7a23fb8845c74c334d582e9a2ef1e477f74f10fa0ea14d17944e
-DIST VTKData-4.2.tar.gz 19257005 RMD160 9ba7b6d90a072ddf228c192d5e13c2fcf749189c SHA1 059e42b32e1f1f575defd5ee2683c56781a788a4 SHA256 7ef7ba4598c94af62d8add507a6d22f0a2f9e3ea7f459aa2a36b39f34ea32153
-DIST VTKDocHtml-4.2.tar.gz 20973979 RMD160 c28817c9274ba968a8afc7d775faaa601ecb419d SHA256 c2288fc858fd933da6a2579b7c3ae572a192a05dbdf0a44016cad054276de6b3
+AUX vtk-qt3-qt4-gentoo.patch 593 RMD160 29e308fb44d79c8f204c47e508da909a390637af SHA1 769b7bffa534ce66be373e04bad169beeca2c3a9 SHA256 7976a5a10bb8f9621077841f8582fcc309837976266f353b3a3e9880d208eefd
+MD5 ad3de5a28c8340c62a91d856af824772 files/vtk-qt3-qt4-gentoo.patch 593
+RMD160 29e308fb44d79c8f204c47e508da909a390637af files/vtk-qt3-qt4-gentoo.patch 593
+SHA256 7976a5a10bb8f9621077841f8582fcc309837976266f353b3a3e9880d208eefd files/vtk-qt3-qt4-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 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
-EBUILD vtk-4.2.6.ebuild 5774 RMD160 cf210c71df98b424a70178106201d75324324865 SHA1 03331067f3c7ec95aeb543f45325bfd343fc92da SHA256 3a65fd2f98967db28e07018a9110b800d54d1c3fb8f1d554effb9b88a3484aab
-MD5 d5f5c1724c0fa907a69829a4ee9b1555 vtk-4.2.6.ebuild 5774
-RMD160 cf210c71df98b424a70178106201d75324324865 vtk-4.2.6.ebuild 5774
-SHA256 3a65fd2f98967db28e07018a9110b800d54d1c3fb8f1d554effb9b88a3484aab vtk-4.2.6.ebuild 5774
 EBUILD vtk-5.0.0.ebuild 8303 RMD160 30fe10485f8e4832bb00a3ca5719b1f68da64145 SHA1 38dd8f6137be5006d8dd5656dd8a9df8fda01660 SHA256 c0c11e198c8bc0038a9f3bac2e77f744f724572751c5c8837e0b65af25784016
 MD5 649790c3bfd3fffd6a4973ebc1a58591 vtk-5.0.0.ebuild 8303
 RMD160 30fe10485f8e4832bb00a3ca5719b1f68da64145 vtk-5.0.0.ebuild 8303
@@ -25,17 +14,14 @@ EBUILD vtk-5.0.1.ebuild 8357 RMD160 949e9d2d7e8761b6346b081b84d3a2f4764d0455 SHA
 MD5 12d12ee568dcae16e7939e97ae02f716 vtk-5.0.1.ebuild 8357
 RMD160 949e9d2d7e8761b6346b081b84d3a2f4764d0455 vtk-5.0.1.ebuild 8357
 SHA256 faede8e9e25d0a8d55adfa2535fb3c0dd2982b0e96fccfc2cee2da4beb0fc0d4 vtk-5.0.1.ebuild 8357
-MISC ChangeLog 3819 RMD160 7a2051f645de47ab073c9b2b6d9f006516d331db SHA1 897ebeb3c4453929a4fc25a3b666aeb497cb4dc4 SHA256 bd9a9a09d6faa7f7be46f5925c558d2ba425358e89dae815cc58eb7009cb34f7
-MD5 5a2f3b79ea2a86e9462d58292a4ec656 ChangeLog 3819
-RMD160 7a2051f645de47ab073c9b2b6d9f006516d331db ChangeLog 3819
-SHA256 bd9a9a09d6faa7f7be46f5925c558d2ba425358e89dae815cc58eb7009cb34f7 ChangeLog 3819
+MISC ChangeLog 4078 RMD160 33806d418e1e5c1aacb7f40643e8a675304b36ba SHA1 5dd39150069bd0d09e5ba1763ac6187761fb5b0f SHA256 c5aa45f0287c0f132dcaad532e9b846d1b02ffc50720f6a2cda1622b56f63d1c
+MD5 2827b61ef10d74cefe961215e32b0503 ChangeLog 4078
+RMD160 33806d418e1e5c1aacb7f40643e8a675304b36ba ChangeLog 4078
+SHA256 c5aa45f0287c0f132dcaad532e9b846d1b02ffc50720f6a2cda1622b56f63d1c ChangeLog 4078
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 metadata.xml 254
-MD5 86f6e1d7f2496767255664ba61932a73 files/digest-vtk-4.2.6 759
-RMD160 0879e3bfe67d7d6b36190d07c36078b2dcff84a7 files/digest-vtk-4.2.6 759
-SHA256 91657ca84c331e15af851b4020fcede71187502be81a83b62a9d16e1c39ea60e 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
diff --git a/sci-libs/vtk/files/digest-vtk-4.2.6 b/sci-libs/vtk/files/digest-vtk-4.2.6
deleted file mode 100644
index d2ba3d648724..000000000000
--- a/sci-libs/vtk/files/digest-vtk-4.2.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 41382fb3f8d15e76d7464c11045ee7a5 VTK-4.2-LatestRelease.tar.gz 6073644
-RMD160 71a092cf929cfaeeb8f297334cadb829209b9ad7 VTK-4.2-LatestRelease.tar.gz 6073644
-SHA256 0ba6513a1acf7a23fb8845c74c334d582e9a2ef1e477f74f10fa0ea14d17944e VTK-4.2-LatestRelease.tar.gz 6073644
-MD5 2bbd1a62884906eac4f279441cbb9cfa VTKData-4.2.tar.gz 19257005
-RMD160 9ba7b6d90a072ddf228c192d5e13c2fcf749189c VTKData-4.2.tar.gz 19257005
-SHA256 7ef7ba4598c94af62d8add507a6d22f0a2f9e3ea7f459aa2a36b39f34ea32153 VTKData-4.2.tar.gz 19257005
-MD5 d2bf17b75e6664d89c3a5eba0a9ad24d VTKDocHtml-4.2.tar.gz 20973979
-RMD160 c28817c9274ba968a8afc7d775faaa601ecb419d VTKDocHtml-4.2.tar.gz 20973979
-SHA256 c2288fc858fd933da6a2579b7c3ae572a192a05dbdf0a44016cad054276de6b3 VTKDocHtml-4.2.tar.gz 20973979
diff --git a/sci-libs/vtk/files/vtk-4.2.6-gcc34.patch b/sci-libs/vtk/files/vtk-4.2.6-gcc34.patch
deleted file mode 100644
index b85d00f17572..000000000000
--- a/sci-libs/vtk/files/vtk-4.2.6-gcc34.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur VTK.orig/IO/vtkBMPReader.cxx VTK/IO/vtkBMPReader.cxx
---- VTK.orig/IO/vtkBMPReader.cxx	2003-02-25 11:59:24.000000000 -0500
-+++ VTK/IO/vtkBMPReader.cxx	2005-03-03 00:20:31.000000000 -0500
-@@ -504,11 +504,11 @@
-         outPtr0 += outIncr[0];
-         }
-       // move to the next row in the file and data
--      self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg);
-+      self->GetFile()->seekg(self->GetFile()->tellg() + (ios::pos_type)streamSkip0, ios::beg);
-       outPtr1 += outIncr[1];
-       }
-     // move to the next image in the file and data
--    self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg);
-+    self->GetFile()->seekg(self->GetFile()->tellg() + (ios::pos_type)streamSkip1, ios::beg);
-     outPtr2 += outIncr[2];
-     }
- 
-diff -ur VTK.orig/IO/vtkImageReader.cxx VTK/IO/vtkImageReader.cxx
---- VTK.orig/IO/vtkImageReader.cxx	2002-12-26 13:18:50.000000000 -0500
-+++ VTK/IO/vtkImageReader.cxx	2005-03-03 00:20:01.000000000 -0500
-@@ -366,7 +366,7 @@
-       // if that happens, store the value in correction and apply later
-       if (filePos + streamSkip0 >= 0)
-         {
--        self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg);
-+        self->GetFile()->seekg(self->GetFile()->tellg() + (ios::pos_type)streamSkip0, ios::beg);
-         correction = 0;
-         }
-       else
-@@ -376,7 +376,7 @@
-       outPtr1 += outIncr[1];
-       }
-     // move to the next image in the file and data
--    self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, 
-+    self->GetFile()->seekg(self->GetFile()->tellg() + (ios::pos_type)streamSkip1 + (ios::pos_type)correction, 
-                       ios::beg);
-     outPtr2 += outIncr[2];
-     }
diff --git a/sci-libs/vtk/vtk-4.2.6.ebuild b/sci-libs/vtk/vtk-4.2.6.ebuild
deleted file mode 100644
index ce70c7b2e4b5..000000000000
--- a/sci-libs/vtk/vtk-4.2.6.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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-4.2.6.ebuild,v 1.11 2006/07/10 12:41:27 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
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="http://www.vtk.org"
-SRC_URI="mirror://sourceforge/${PN}/VTK-${MY_PV}-LatestRelease.tar.gz
-	doc? ( mirror://sourceforge/${PN}/VTKDocHtml-${MY_PV}.tar.gz )
-	examples? ( mirror://sourceforge/${PN}/VTKData-${MY_PV}.tar.gz )"
-
-LICENSE="BSD"
-KEYWORDS="~x86"
-SLOT="0"
-IUSE="doc examples java mpi patented python tcltk threads"
-RDEPEND="java? ( =virtual/jdk-1.4* )
-	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-1.8"
-
-S=${WORKDIR}/VTK
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gcc34.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
-
-	# 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} -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
-
-	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"
-
-	# 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() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	# fix config file
-	sed -i -e "s:${D}:/:g" ${D}/usr/$(get_libdir)/${PN}/VTKConfig.cmake
-
-	LDPATH="/usr/$(get_libdir)/${PN}"
-	# install python modules
-	if use python; then
-		distutils_python_version
-		LDPATH="${LDPATH}:/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}_python"
-		cd ${S}/Wrapping/Python
-		docinto vtk_python
-		distutils_src_install
-
-		# make symlinks to vtk python modules
-		FILES="${D}/usr/$(get_libdir)/vtk/libvtk*Python*.so"
-		for file in ${FILES}
-		do
-			dosym ${file} /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}_python
-		done
-	fi
-
-	# install jar
-	use java && java-pkg_dojar ${S}/bin/vtk.jar
-
-	# install documentation
-	use doc && dohtml -r ${WORKDIR}/html/
-
-	# install examples
-	if use examples; then
-		dodir /usr/share/${PN}
-		cp -pPR ${S}/Examples ${D}/usr/share/${PN}/examples
-
-		# fix example's permissions
-		find ${D}/usr/share/${PN}/examples -type d -exec chmod 0755 {} \;
-		find ${D}/usr/share/${PN}/examples -type f -exec chmod 0644 {} \;
-
-		# VTKData uses a hyphen instead of a dot
-		MY_PV_HYPHEN=`echo ${MY_PV} | sed -e "s/\./-/"`
-		dodir /usr/share/${PN}
-		cp -pPR ${WORKDIR}/VTKData-release-${MY_PV_HYPHEN} ${D}/usr/share/${PN}/data
-
-		# fix data's permissions
-		find ${D}/usr/share/${PN}/data -type d -exec chmod 0755 {} \;
-		find ${D}/usr/share/${PN}/data -type f -exec chmod 0644 {} \;
-	fi
-
-	# environment
-	echo "LDPATH=${LDPATH}" > ${T}/40${PN}
-	echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> ${T}/40${PN}
-	echo "LD_LIBRARY_PATH=/usr/$(get_libdir)/${PN}" >> ${T}/40${PN}
-	if use java; then
-		echo "CLASSPATH=/usr/share/${PN}/lib/${PN}.jar" >> ${T}/40${PN}
-	fi
-	use tcltk && echo "TCLLIBPATH=/usr/$(get_libdir)/${PN}/tcl" >> ${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
-}