Fixed improper install location of support files (see bug #239553).

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-SENTINEL-2 i686

4 files changed, 34 insertions, 4 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index c8794cb8df00..2dd3fd559df9 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.50 2008/10/02 23:37:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.51 2008/10/05 16:42:02 markusle Exp $
+
+*vtk-5.2.0-r1 (05 Oct 2008)
+
+  05 Oct 2008; Markus Dittrich <markusle@gentoo.org> 
+  +files/vtk-5.2.0-tcl-install.patch, -vtk-5.2.0.ebuild,
+  +vtk-5.2.0-r1.ebuild:
+  Fixed improper install location of support files (see bug #239553).
 
 *vtk-5.2.0 (01 Oct 2008)
 
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 9e095c6574db..3ecdedd64dac 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,5 +1,6 @@
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
+AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
 DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c
 DIST vtk-5.0.4-tcl8.5.patch.bz2 92930 RMD160 2fabbddda92f359204b830816b04a18bff553b87 SHA1 8be5de85b75241529b6c44d0197766db0f5d8ffa SHA256 b7125e09689a267334fbf89c173a9f5c6cc4e279baa6f00e11cbd2036afc101e
 DIST vtk-5.0.4.tar.gz 8344794 RMD160 9c9b3eb43c7425ba2e4fd40b75caae100c49a12c SHA1 da881bcb3e4cb6675cde00c4fe10e1dde81909c3 SHA256 f95f181d61b4af37157e733b4dee4f47c39804e987c2d033ecb81a82e53ecf84
@@ -10,6 +11,6 @@ DIST vtkdata-5.0.4.tar.gz 22403386 RMD160 af1fcadc568f15c230756bb9ee939159294b0c
 DIST vtkdata-5.2.0.tar.gz 30464776 RMD160 f079ffde387010dbd155dd9f1ac136215d459b33 SHA1 3e85ef88e371980a294a7752f04573b821d1b1c4 SHA256 d61171c1debb3212e0f62694faf8f2968721f00f1812d5eddb77d8fdab8d9229
 EBUILD vtk-5.0.3.ebuild 9099 RMD160 af206b44baf110292be7651ea3c4676c8b5cca65 SHA1 ba58db375e2d3d09ddf4fba53235c161dd4ccfab SHA256 ed00e3099fe57e93166f344060a3e321d2f6fda059e15424b2b367ac431d0927
 EBUILD vtk-5.0.4.ebuild 9141 RMD160 e9784463073b1722c509781a2d751b4f6d9e39f6 SHA1 826dda44a0d1dff821ca0a514ecb8632b3c5fa77 SHA256 6c124c6a1d369b985a7a3bd1e903449149dc8fee3e1cba37f482440f0bae61fb
-EBUILD vtk-5.2.0.ebuild 9611 RMD160 1fc0da144016d53fff06b43d8eeac92b7c100f1d SHA1 6586419e69fe1ff9a73a09177c87cea48b7129d1 SHA256 6f01fedf0a4c28c6681911571b2b5a8b26ae07dae9ea51fccf4f78c5086c3d87
-MISC ChangeLog 8644 RMD160 7b5066f1760441ebcd1a559889f4a5088dcd7887 SHA1 4783a3b9e97b61db1e9113a8118b6995b60896ff SHA256 aaab7b67230242e6a131ed77108242e99542f060d9f8d3748fecdcfd12dac0c0
+EBUILD vtk-5.2.0-r1.ebuild 9933 RMD160 f7800ade0f9d78cca4c637358e4dee7c1c4bd808 SHA1 775e4bad4db23772f90ed442aee93fe0274469f3 SHA256 cddac73a34a7ebfd04f231b8c027ba5cf5b9921c97d81a340cd55e9e1d9ab1d9
+MISC ChangeLog 8879 RMD160 64e9300c40fed6a54a81e2b8d49f65267f53b33c SHA1 e17781b6b2fa927456b87f76b25158f2faf02c91 SHA256 861027cc4382059600a431fdae3a71d1e904597ad9bc72ad791912ef3a485f78
 MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
diff --git a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch
new file mode 100644
index 000000000000..c7da78678825
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch
@@ -0,0 +1,12 @@
+diff -Naur VTK/CMakeLists.txt VTK.new/CMakeLists.txt
+--- VTK/CMakeLists.txt	2008-05-13 17:50:09.000000000 -0400
++++ VTK.new/CMakeLists.txt	2008-10-05 10:34:42.000000000 -0400
+@@ -182,7 +182,7 @@
+ # Compute the proper location for installing the Tcl package.  This
+ # must be a fixed relative path below the library install location and
+ # is therefore not settable by parent projects.
+-SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_LIB_DIR})
++SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_PACKAGE_DIR})
+ 
+ IF(NOT VTK_INSTALL_JAVA_DIR)
+   SET(VTK_INSTALL_JAVA_DIR ${VTK_INSTALL_PACKAGE_DIR}/java)
diff --git a/sci-libs/vtk/vtk-5.2.0.ebuild b/sci-libs/vtk/vtk-5.2.0-r1.ebuild
index e5683d569ad5..0bbd08ee176b 100644
--- a/sci-libs/vtk/vtk-5.2.0.ebuild
+++ b/sci-libs/vtk/vtk-5.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.2.0.ebuild,v 1.1 2008/10/02 23:37:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.2.0-r1.ebuild,v 1.1 2008/10/05 16:42:02 markusle Exp $
 
 EAPI="1"
 inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 qt4
@@ -68,6 +68,15 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-tcl-install.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_compile() {
 	# gcc versions 3.2.x seem to have sse-related bugs that are
 	# triggered by VTK when compiling for pentium3/4
@@ -85,6 +94,7 @@ src_compile() {
 
 	# build list of config variable define's to pass to cmake
 	local CMAKE_VARIABLES=""
+	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_PACKAGE_DIR:PATH=/$(get_libdir)/${PN}-${SPV}"
 	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_SKIP_RPATH:BOOL=YES"
 	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_DIR:PATH=${S}"
 	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DVTK_INSTALL_LIB_DIR:PATH=/$(get_libdir)/"