diff options
author | François Bissey <francois.bissey@canterbury.ac.nz> | 2011-01-31 20:49:04 +1300 |
---|---|---|
committer | François Bissey <francois.bissey@canterbury.ac.nz> | 2011-01-31 20:49:04 +1300 |
commit | 0345f356057f7292ebaaf63d5df8d7c883ba5646 (patch) | |
tree | a81e38575c0b8bd40de2cfba4cba29411062e94e | |
parent | Fix up ebuild per bug #344721. Thanks to Joel Berendzen. (diff) | |
download | sci-0345f356057f7292ebaaf63d5df8d7c883ba5646.tar.gz sci-0345f356057f7292ebaaf63d5df8d7c883ba5646.tar.bz2 sci-0345f356057f7292ebaaf63d5df8d7c883ba5646.zip |
Improvements to paraview-3.8.1
-rw-r--r-- | sci-visualization/paraview/ChangeLog | 4 | ||||
-rw-r--r-- | sci-visualization/paraview/Manifest | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | sci-visualization/paraview/paraview-3.8.1.ebuild | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 299e6c84a..4b9bc1698 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Jan 2011; François Bissey <francois.bissey@canterbury.ac.nz> + paraview-3.8.1.ebuild: + General scrubbing, add plugin development files. + 10 Jan 2011; Oliver Borm (boroli) <oli.borm@web.de> paraview-3.8.1.ebuild: added second python path as this seems to be needed for the compile *.so files diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index e085f1f04..c1f9b45a5 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -8,6 +8,6 @@ AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 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 DIST paraview-3.8.1-OFF.patch.bz2 73798 RMD160 1adc86f42d86b165f2bee4a822f556bfb604986d SHA1 fff976c7cd9785c73030e84b0bb702cb11d7ba82 SHA256 a753253a7ecfdb0ca9a05726bb39affb826c867a9dd746eebf7d61d07ba1ba84 -EBUILD paraview-3.8.1.ebuild 6962 RMD160 5038a05b8a07c145f530f81423e4d6740e77d059 SHA1 546356e96d08c0685e1c31ead6d875f9d40f9bb9 SHA256 a6e5bf33f8e23e932c59c90301e33dd93079a2f92e220efd6fb1809fe7dbc95e -MISC ChangeLog 2419 RMD160 bd3802b86979d3bd773a5aa698706a5b1040c5c9 SHA1 06d1c5deab554790b70d9b1ea4b63eb886263237 SHA256 dd1261290af97cc39a9cb8e94de293c3a73dc8e4b94aecfd3d0b4872b38ea095 +EBUILD paraview-3.8.1.ebuild 7318 RMD160 aeff9de163f319f87249009044023ed9c3441beb SHA1 3ec784491c699c2b1ff4bbdd14915f9549c49629 SHA256 c6ece657f19a3640746f9695a2d1632ffe21e51c72ef9d7f7c10ae4893ea5078 +MISC ChangeLog 2563 RMD160 9232d52cb72262c61fe8aba572f5c831ff32559b SHA1 0fb670a2b26f8f9d8dd14f4b533524a5992fa18f SHA256 c16c6f707a6f1d9240cfe9fb99e6277ab6afe1266c3791a1b59a530ed3b352de 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 55266f11e..2112562e4 100644..100755 --- a/sci-visualization/paraview/paraview-3.8.1.ebuild +++ b/sci-visualization/paraview/paraview-3.8.1.ebuild @@ -74,10 +74,11 @@ src_prepare() { # mpi + hdf5 fix epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch - if use amd64; then - sed -i "s:/usr/lib:/usr/lib64:g" \ - Utilities/Xdmf2/libsrc/CMakeLists.txt || die "sed failed" - fi + # lib64 fixes + sed -i "s:/usr/lib:/usr/$(get_libdir):g" \ + Utilities/Xdmf2/libsrc/CMakeLists.txt || die "sed failed" + sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \ + Utilities/Xdmf2/CMake/setup_install_paths.py || die "sed failed" epatch "${WORKDIR}"/${P}-OFF.patch @@ -88,14 +89,16 @@ src_prepare() { 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" - # Remove FindPythonLibs.cmake to use the patched one from cmake - rm CMake/FindPythonLibs.cmake + # 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() { mycmakeargs=( -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" -DCMAKE_INSTALL_PREFIX=/usr + -DPV_INSTALL_DOC_DIR="/usr/share/doc/${P}" -DEXPAT_INCLUDE_DIR=/usr/include -DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so -DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so @@ -141,6 +144,7 @@ src_configure() { # the rest of the plugins mycmakeargs+=( + $(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT) $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView) $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters) $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) |