From a42108aa6fc22a758f23c46774215c4677d71cfc Mon Sep 17 00:00:00 2001 From: François Bissey Date: Wed, 27 Oct 2010 21:33:07 +1300 Subject: Fix installation of internal copies of 3rd party libraries. --- sci-visualization/paraview/ChangeLog | 4 ++++ sci-visualization/paraview/Manifest | 4 ++-- sci-visualization/paraview/paraview-3.8.1.ebuild | 7 ++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 9f6a8a6c7..4a89a1eeb 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Oct 2010; François Bissey + paraview-3.8.1.ebuild: + Fix installation of copies of Qt and ffmpeg and so on. + *paraview-3.8.1 (27 Oct 2010) 27 Oct 2010; François Bissey diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index e80efcc40..4c245eaad 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -7,6 +7,6 @@ AUX paraview-3.8.0-xdmf-cstring.patch 353 RMD160 3866f7d3ea997099b566386956aa69b AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9 DIST ParaView-3.8.1.tar.gz 33123181 RMD160 66dff2b84bb4d17b9d44142be79d08bc84c76fa0 SHA1 2cffb622f8b991a36df39bf260a1752de9036eb4 SHA256 37647172af0ac7fc3b677cc2d1e2e825cf364cb4915190da74f19992d84e263c -EBUILD paraview-3.8.1.ebuild 6817 RMD160 bcd17eb425fd5283f48847b45d9f3063ee328d1b SHA1 1b9527d420179156f3dad3269146a6762d1f5c2d SHA256 5bf8eda1a9d3f1053c118cb761e0db4fbe049802b771de4a907788f89fa61f30 -MISC ChangeLog 1374 RMD160 c960c99febca7814bd42de42bd9c7914662cc158 SHA1 77f30108c4d98895ca531f3ca0b3923b8f18b4d6 SHA256 08928a3687b11e0c98fc33eca189dc7889d955a035475f9f3fdb0fc81ee98325 +EBUILD paraview-3.8.1.ebuild 6679 RMD160 943e8880f9f2e765b408525b5ce1abe591509f99 SHA1 43d6e7e9b9a547964ab80bd3b45f25e6d2ce33ac SHA256 fe8312ac918d9ea071005cde3b6889a894d3fd6d22de28ecf010e93a4f1c5263 +MISC ChangeLog 1515 RMD160 ec83a5055caac1030ac10d4dc54f47c2a48653f5 SHA1 73c0898e4640aa8bfb91265ad95fdfb5b55d9131 SHA256 09a82e25fa351ab6fbcd61c5fb9f6c8046c2db5a7713334da79bc9508e5a9f8e MISC metadata.xml 811 RMD160 f0af97f0b2ef863ad26006ebeba0ae2000f82d2d SHA1 2c90bde6bfb680006a609c6ec6a7b8d3dbb35494 SHA256 75badcaa670d70e163a608a5cb0ae5184ed6e0b2cf96e15413e92ce91627118d diff --git a/sci-visualization/paraview/paraview-3.8.1.ebuild b/sci-visualization/paraview/paraview-3.8.1.ebuild index e94de2e51..06e9bd6c2 100644 --- a/sci-visualization/paraview/paraview-3.8.1.ebuild +++ b/sci-visualization/paraview/paraview-3.8.1.ebuild @@ -73,10 +73,6 @@ src_prepare() { # mpi + hdf5 fix epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch - # prevent the installation of duplicates of QT libraries. - sed -i "s:SET(_install_qt_libs ON):SET(_install_qt_libs OFF):g" \ - Applications/ParaView/CMakeLists.txt || die "sed failed" - if use amd64; then sed -i "s:/usr/lib:/usr/lib64:g" \ Utilities/Xdmf2/libsrc/CMakeLists.txt || die "sed failed" @@ -115,7 +111,8 @@ src_configure() { -DVTK_USE_OFFSCREEN=TRUE -DCMAKE_USE_PTHREADS=ON -DBUILD_TESTING=OFF - -DVTK_USE_FFMPEG_ENCODER=OFF) + -DVTK_USE_FFMPEG_ENCODER=OFF + -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF) # use flag triggered options mycmakeargs+=( -- cgit v1.2.3-65-gdbad