Added patch and fixes to ebuild to remove several install location snafus.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 42 insertions, 4 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index b6d445ecc2c9..04afc6ad5dec 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.38 2009/07/27 09:32:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.39 2009/07/28 15:16:45 markusle Exp $
+
+  28 Jul 2009; Markus Dittrich <markusle@gentoo.org> paraview-3.6.1.ebuild,
+  +files/paraview-3.6.1-no-doc-finder.patch:
+  Added patch and fixes to ebuild to remove several install location
+  snafus.
 
   27 Jul 2009; Markus Dittrich <markusle@gentoo.org> paraview-3.6.1.ebuild:
   Have paraview block vtk until a better solution is found (#279264).
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 744be8f46e05..7b092392ac18 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -6,6 +6,7 @@ AUX paraview-3.4.0-qt4.4-5.patch 36215 RMD160 b30c7a14deabed70421af8e1a50041778e
 AUX paraview-3.6.1-assistant.patch 1122 RMD160 4f6ecb6bd6105b3b4a5a7848782cfe92e6741d18 SHA1 81b47c0a30336fbfb45d55f2480474c994d7f820 SHA256 62fbe1310ee8f0c2405ff12cfe9edb50100e654678e7fb823f78084f284130d3
 AUX paraview-3.6.1-hdf-1.8.3.patch 2763 RMD160 f6a557565e75541e74b7052cdbd797e56e39f85b SHA1 d70f2b2715b3cebecb2db82d8c05b60fbb0220d1 SHA256 97247cc3fcb887de3bbf73a80ecda270c7f282802c365b21f20c518b76f2d3be
 AUX paraview-3.6.1-install-fix.patch 6861 RMD160 4c65e8f95670a740b67146cbf943e8d6340e4857 SHA1 17d02c81884f5a1c56832a26026265e53aa18566 SHA256 aa991a873f3f692981df75ff20dc67d55ab38fc8de2ee3b11d05326419d4b2c1
+AUX paraview-3.6.1-no-doc-finder.patch 787 RMD160 e3669d31061d69cb2007be0aa9be2d83de465745 SHA1 591e47194d9a02bc0277906cb3aac1742a6bee37 SHA256 7c264e9ab359928f5d3d23369b07ea9a698554434357744622f1267a2df732b6
 AUX paraview-3.6.1-pointsprite-disable.patch 617 RMD160 bef259c2e5edf7b3a8af32a204432d2761ac0834 SHA1 624f682127a5b382475bd0e7a65cab1b9c51c228 SHA256 fb413c38df3461c8840de776442de37171bfeabc42d83be8699d205d41b7b4d6
 AUX paraview-3.6.1-qt.patch 7544 RMD160 0396a656029cc1f9562e6b16eb739a8e7960565a SHA1 409c19532bc2ed48cb22c344e1d9db0960147e9a SHA256 d678173f19a393010949582e8353b3e9436fd02bea940a0df49cda90ed4874a4
 DIST paraview-3.3_pre20080514-OpenFOAM-1.5.patch.bz2 55771 RMD160 4b40990c5180157ddb7b4945d77de6f8a8ed52ee SHA1 6a673c78222e0f58c36c0d99c604216301960daf SHA256 a85a9011d67c9a3f6ed0b0f7c5c5bf6a6ade8c9989dc48a48cb552ebbed4dcd6
@@ -17,6 +18,6 @@ DIST paraview-3.6.1-openfoam-r120.patch.bz2 58046 RMD160 dec759a9d0bebd83bee6d99
 DIST paraview-3.6.1.tar.gz 27119089 RMD160 8892434c1096d18e83bce6c62f1a7b07a8be1f0a SHA1 aedbe3bf8d831816972129c185565b582e331b53 SHA256 df71c052a4f85a568d3e4a4b55abb257c976795492d3991e32fe4100c3fd8a4e
 EBUILD paraview-3.3_pre20080514.ebuild 5811 RMD160 a9d6d865780f1186d87681bedc80e9c14183224c SHA1 98ab4cf8ed0b47678007c9d98d035c4922eeccb6 SHA256 33b3e81eec889e84fd582fe878a24664137c134d95f535ccbe6756992b348a04
 EBUILD paraview-3.4.0.ebuild 5365 RMD160 032b9da72489a5c737178265705cabd47859e710 SHA1 afe3da6fba526a1b071fbbd229879b6d682e669b SHA256 90dad827174b7e8e254aee4425c7daa4b3432ac9490ab1ae3b6496a98cfe15ed
-EBUILD paraview-3.6.1.ebuild 8889 RMD160 1dd0e4e07d237fe23165eec7445ea28719e0ca5d SHA1 e7a73e4c7b4106fc801ad896fb630cb0ff72dcf5 SHA256 41e709d15aa4aeb6446626faea1a93868fbadf26e1df45f6e4949759ce066bfb
-MISC ChangeLog 7787 RMD160 f1326efd9376edc4b26eb2e0cb1ce05cd2f4622a SHA1 148d5e991cb9299b03af03cdaaf80a19ce5490e3 SHA256 25dfe76afa082e1ab8bf9f7d5045c185830a4dac68b4a6047cdab83d35554808
+EBUILD paraview-3.6.1.ebuild 9491 RMD160 78dc0319594357e34d2d8ac6019099bc9ff0d8d1 SHA1 be9e2870603949fc1f7993ef174ee4459d3ed99c SHA256 4dc18cdf2045c3d93886a922d03ada69885df7da52a20b2f3cf86b01482314da
+MISC ChangeLog 7988 RMD160 bed96f203b6387fd40982a54cb0c07bd6bc8e872 SHA1 8ea21b54ef96afa2d3c33ef3d45c75b8f2cef3a5 SHA256 47ff07bcb838ffa36e935135c4a6762fe6ade9e63633330967c0ac5c98b6fce1
 MISC metadata.xml 399 RMD160 131a5c96291217e416af0d726c40ed5624e3bf7b SHA1 f4b99deaa2bb2bf39c32b16fb8bfff81fb14759d SHA256 8c9a511c364dce29e73c21df5a6e51e94817e33e16a27127bba8f4ec9f3ba9cb
diff --git a/sci-visualization/paraview/files/paraview-3.6.1-no-doc-finder.patch b/sci-visualization/paraview/files/paraview-3.6.1-no-doc-finder.patch
new file mode 100644
index 000000000000..a98d004197d0
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.1-no-doc-finder.patch
@@ -0,0 +1,18 @@
+diff -Naur ParaView3.old/Applications/Client/CMakeLists.txt ParaView3/Applications/Client/CMakeLists.txt
+--- ParaView3.old/Applications/Client/CMakeLists.txt	2009-07-20 15:36:01.000000000 -0400
++++ ParaView3/Applications/Client/CMakeLists.txt	2009-07-28 09:28:12.000000000 -0400
+@@ -128,10 +128,10 @@
+       "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"

+       @ONLY 

+       IMMEDIATE)

+-  INSTALL(

+-      FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"

+-      DESTINATION ${PV_INSTALL_BIN_DIR}

+-      COMPONENT Runtime)

++    #  INSTALL(

++    #  FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt"

++    #  DESTINATION ${PV_INSTALL_BIN_DIR}

++    #  COMPONENT Runtime)

+ ENDIF(NOT PV_INSTALL_NO_RUNTIME)

+ 

+ IF(BUILD_TESTING)

diff --git a/sci-visualization/paraview/paraview-3.6.1.ebuild b/sci-visualization/paraview/paraview-3.6.1.ebuild
index badc7b7e965a..b3c52b96f66e 100644
--- a/sci-visualization/paraview/paraview-3.6.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild,v 1.6 2009/07/27 09:32:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.1.ebuild,v 1.7 2009/07/28 15:16:45 markusle Exp $
 
 EAPI="2"
 
@@ -59,6 +59,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-assistant.patch
 	epatch "${DISTDIR}"/${P}-openfoam-r120.patch.bz2
 	epatch "${DISTDIR}"/${P}-openfoam-gpl-r120.patch.bz2
+	epatch "${FILESDIR}"/${P}-no-doc-finder.patch
 
 	if use hdf5 && has_version '>=sci-libs/hdf5-1.8.0'; then
 		epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch
@@ -69,6 +70,10 @@ src_prepare() {
 		-i VTK/Rendering/vtkOpenGLRenderWindow.cxx \
 		|| die "Failed to fix GL issues."
 
+	# fix plugin install directory
+	sed -e "s:\${PV_INSTALL_BIN_DIR}/plugins:/usr/${PVLIBDIR}/plugins:" \
+		-i CMake/ParaViewPlugins.cmake \
+		|| die "Failed to fix plugin install directories"
 }
 
 src_compile() {
@@ -199,6 +204,15 @@ src_install() {
 	# set up the environment
 	echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN}
 	doenvd "${T}"/40${PN}
+
+	# move and remove some of the files that should not be 
+	# in /usr/bin
+	dohtml "${D}/usr/bin/about.html" && rm -f "${D}/usr/bin/about.html" \
+		|| die "Failed to move about.html into doc dir"
+
+	# this binary does not work and probably should not be installed
+	rm -f "${D}/usr/bin/vtkSMExtractDocumentation" \
+		|| die "Failed to remove vtkSMExtractDocumentation"
 }
 
 pkg_postinst() {