sci-libs/openfoam: Corrected some typos in the sed commands and an einfo to the ebuild.

svn path=/sunrise/; revision=5075

diff --git a/sci-libs/openfoam/ChangeLog b/sci-libs/openfoam/ChangeLog
index b3b4dafda2209efb2471709ab427fb52899b9aa9..e0503bb10cface091b2f2de60ebe99a007bad092 100644 (file)
--- a/sci-libs/openfoam/ChangeLog
+++ b/sci-libs/openfoam/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Nov 2007; Oliver Borm (boroli) <oli.borm@web.de>
+  openfoam-1.4.1_p20071028.ebuild:
+  Corrected some typos in the sed commands and an einfo to the ebuild.
+
   05 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
   openfoam-1.4.1_p20071028.ebuild:
   make it multilib-safe

diff --git a/sci-libs/openfoam/Manifest b/sci-libs/openfoam/Manifest
index fb2ba3e307d948784c8f1eca7efd7c2c2509e2f1..b2384f30c148ed0822167c481bb5234e29262a4d 100644 (file)
--- a/sci-libs/openfoam/Manifest
+++ b/sci-libs/openfoam/Manifest
@@ -3,6 +3,6 @@ AUX mico-1.4.1.patch 763 RMD160 ac0f242ccfd7b37a4c47f604d7be37a72d76320f SHA1 b3
 AUX openfoam-1.4.1_p20071028.patch 599007 RMD160 5f50b78e8e28cf734ac1c6f14c3623771d4c82e1 SHA1 4c2c543aa606dbc75c7e1805953c809946708d43 SHA256 6233d0c2d6ff3c6a9c0d4c2470ba4b1c96215bc3a9bb198343410556545ad8ae
 DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
 DIST ParaView-2.6.2.tar.gz 75658768 RMD160 068f3fbfea17166d34c488b4e6bd8d8fb07d3cd9 SHA1 ac5efb1c850e89b76dda4f28ecfa4575e45aa22e SHA256 de7cbd808e1ab1730ad87436d30c0a752096a65fe9aa6b82f35a39fc3b67d7c7
-EBUILD openfoam-1.4.1_p20071028.ebuild 15057 RMD160 b3e4d206ba9aa30df05f38085e7cb5983541c4c6 SHA1 2f78d611a3e6eec9de1bf604be735a972f951ec9 SHA256 a4f63fa6fb261de03c72a27544bf025abb55b0f7d81b195a18da97bd9dd5165b
-MISC ChangeLog 989 RMD160 cd6f1f3c6b2c413560c90c5ba24d27d5b9c5ba4e SHA1 f88b3a50bcd69d383b6083cc1d515458ad462199 SHA256 1fa2643df68fe209b25b07427536a63a0d67a9969495f88761bb1b54dcb66c86
+EBUILD openfoam-1.4.1_p20071028.ebuild 15694 RMD160 336133287b52a414940e0eff08a7f99d49cbca67 SHA1 bbb68c13e87adb602eac576cdff39c7d2695a928 SHA256 a086e655ec1360cd8918499ebd2beb7074306d02ed44b9b0f064cdb0d7d55d27
+MISC ChangeLog 1150 RMD160 39e286066afc7e75dbade5f86ee65c996de69f89 SHA1 db47a39e5e756e0b88d7c85f380cdf52f6d7e49d SHA256 96d1f9c00952824dee9c52403f2fec79df404ef68c61081927f91364a8145f1b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/sci-libs/openfoam/openfoam-1.4.1_p20071028.ebuild b/sci-libs/openfoam/openfoam-1.4.1_p20071028.ebuild
index cc8182d2f055e6948321e785b776a496d58dc7c6..8913ba752a9fe2e931c01bfa8367f15317726405 100644 (file)
--- a/sci-libs/openfoam/openfoam-1.4.1_p20071028.ebuild
+++ b/sci-libs/openfoam/openfoam-1.4.1_p20071028.ebuild
@@ -30,8 +30,7 @@ RDEPEND="dev-java/sun-java3d-bin
        !mpich? ( !lam? ( sys-cluster/openmpi ) )
        lam? ( sys-cluster/lam-mpi )
        mpich? ( sys-cluster/mpich2 )
-       metis? ( sci-libs/metis
-               sci-libs/parmetis )
+       metis? ( sci-libs/metis sci-libs/metis sci-libs/parmetis )
        parafoam? ( sci-libs/vtk
                =sci-visualization/paraview-${MY_PARA_PV} )
        !parafoam? ( sci-visualization/paraview )"
@@ -58,7 +57,7 @@ pkg_setup() {
                ewarn
        else
                ewarn
-               ewarn " You are building with parafoam enabled, this means "
+               ewarn " You are building with parafoam disabled, this means "
                ewarn " that paraFoam will not be installed. "
                ewarn " You have to use instead the native OpenFOAM support in ParaView-${MY_PARA_PV}: "
                ewarn " You have to open the controlDict file of each case and "
@@ -77,6 +76,19 @@ pkg_setup() {
                ewarn
        fi
 
+       if use amd64 ; then
+               einfo
+               einfo "In order to use OpenFOAM you should add the following lines to ~/.bashrc :"
+               einfo 'WM_64="on"'
+               einfo "source /usr/$(get_libdir)/OpenFOAM/bashrc"
+               einfo
+       else
+               einfo
+               einfo "In order to use OpenFOAM you should add the following line to ~/.bashrc :"
+               einfo "source /usr/$(get_libdir)/OpenFOAM/bashrc"
+               einfo
+       fi
+
        java-pkg-2_pkg_setup
 }
 
@@ -169,7 +181,7 @@ src_compile() {
                -e "${index2}{s|[^#]|# f|}"     \
                -e "s|[^#]export PATH=\$CMAKE_HOME/|# export PATH=\$CMAKE_HOME/|"       \
                -e "s|ParaView_VERSION=|ParaView_VERSION=${MY_PARA_PV} # |"     \
-               -e "s|ParaView_INST_DIR=\$WM_PROJECT_INST_DIR/\$WM_ARCH/paraview-\$ParaView_VERSION|ParaView_VERSION=/usr|"     \
+               -e "s|ParaView_INST_DIR=\$WM_PROJECT_INST_DIR/\$WM_ARCH/paraview-\$ParaView_VERSION|ParaView_INST_DIR=/usr|"    \
                -e "s|\$ParaView_INST_DIR/lib/paraview-2.4|\$ParaView_INST_DIR/lib/ParaView-${MY_PARA_PV_SHORT}|"       \
                -e "s|[^#]export PATH=\$ParaView_INST_DIR|# export PATH=\$ParaView_INST_DIR|"   \
                -e "s|[^#]export LD_LIBRARY_PATH=|# export LD_LIBRARY_PATH=|"   \
@@ -183,7 +195,7 @@ src_compile() {
                -e "${index2}{s|[^#]|# f|}"     \
                -e "s|[^#]set path=(\$CMAKE_HOME/|# set path=(\$CMAKE_HOME/|"   \
                -e "s|ParaView_VERSION |ParaView_VERSION ${MY_PARA_PV} # |"     \
-               -e "s|ParaView_INST_DIR \$WM_PROJECT_INST_DIR/\$WM_ARCH/paraview-\$ParaView_VERSION|ParaView_VERSION /usr|"     \
+               -e "s|ParaView_INST_DIR \$WM_PROJECT_INST_DIR/\$WM_ARCH/paraview-\$ParaView_VERSION|ParaView_INST_DIR /usr|"    \
                -e "s|\$ParaView_INST_DIR/lib/paraview-2.4|\$ParaView_INST_DIR/lib/ParaView-${MY_PARA_PV_SHORT}|"       \
                -e "s|[^#]set path=(\$ParaView_INST_DIR|# set path=(\$ParaView_INST_DIR|"       \
                -e "s|[^#]setenv LD_LIBRARY_PATH|# setenv LD_LIBRARY_PATH|"     \
@@ -202,28 +214,35 @@ src_compile() {
        fi
 
        if use metis ; then
-               sed -i -e 's|-lmetis \\|-L/usr/$(get_libdir) -lmetis|'  \
-               -e 's|../metis-5.0pre2/include|/usr/include/ -I/usr/include/metis/ -I/usr/include/parmetis/|'   \
+               sed -i -e "s|-lmetis \\\|-L/usr/$(get_libdir) -lmetis|" \
+               -e 's|../metis-5.0pre2/include|/usr/include|'   \
                -e 's|-lGKlib||'        \
                "${S}"/applications/utilities/parallelProcessing/decompositionMethods/decompositionMethods/Make/options \
                || die "could not replace metis options"
 
-               sed -i -e 's|[^#]wmake libso metis|# wmake libso metis|'        \
+               sed -i -e 's|wmake libso metis|# wmake libso metis|'    \
                "${S}"/applications/utilities/parallelProcessing/decompositionMethods/Allwmake  \
                || die "could not replace metis options"
 
-               sed -i -e 's|[^#]wmake libso ParMetis|# wmake libso ParMetis|'  \
+               sed -i -e 's|wmake libso ParMetis|# wmake libso ParMetis|'      \
                "${S}"/applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/Allwmake   \
                || die "could not replace metis options"
 
                sed -i -e 's|parMetisDecomp/ParMetis-3.1/ParMETISLib|/usr/include/parmetis|'    \
-               -e 's|parMetisDecomp/ParMetis-3.1/|/usr/include/|'      \
-               -e 's|-lmetis|-L/usr/$(get_libdir) -lmetis|'    \
-               -e 's|-lparmetis|-L/usr/$(get_libdir) -lparmetis|'      \
+               -e 's|parMetisDecomp/ParMetis-3.1|/usr/include|'        \
+               -e "s|-lmetis|-L/usr/$(get_libdir) -lMETIS -lmetis|"    \
+               -e "s|-lparmetis|-L/usr/$(get_libdir) -lparmetis|"      \
                "${S}"/applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/Make/options       \
                || die "could not replace metis options"
        fi
 
+       cp "${S}"/.${MY_P}/bashrc "${S}"/.${MY_P}/bashrc.bak
+
+       sed -i -e "s|WM_PROJECT_INST_DIR=/usr/lib/\$WM_PROJECT|WM_PROJECT_INST_DIR="${WORKDIR}"|"               \
+               -e "s|WM_PROJECT_DIR=\$WM_PROJECT_INST_DIR/\$WM_PROJECT-\$WM_PROJECT_VERSION|WM_PROJECT_DIR="${S}"|"    \
+               "${S}"/.${MY_P}/bashrc.bak      \
+               || die "could not replace source options"
+
        if use parafoam ; then
                cd "${WORKDIR}"/paraview-${MY_PARA_PV}-obj
 
@@ -281,6 +300,10 @@ src_compile() {
                "${S}"/.${MY_P}/bashrc  \
                || die "could not replace source options"
 
+               sed -i -e "s|#SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps/paraview/bashrc|SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps/paraview/bashrc.bak|"     \
+               "${S}"/.${MY_P}/bashrc.bak      \
+               || die "could not replace source options"
+
                sed -i -e "s|/include|/include/vtk-5.0|"        \
                        "${S}"/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/Make/options
 
@@ -291,13 +314,6 @@ src_compile() {
                || die "could not replace source options"
        fi
 
-       cp "${S}"/.${MY_P}/bashrc "${S}"/.${MY_P}/bashrc.bak
-
-       sed -i -e "s|WM_PROJECT_INST_DIR=/usr/lib/\$WM_PROJECT|WM_PROJECT_INST_DIR="${WORKDIR}"|"               \
-               -e "s|WM_PROJECT_DIR=\$WM_PROJECT_INST_DIR/\$WM_PROJECT-\$WM_PROJECT_VERSION|WM_PROJECT_DIR="${S}"|"    \
-               "${S}"/.${MY_P}/bashrc.bak      \
-               || die "could not replace source options"
-
        . "${S}"/.${MY_P}/bashrc.bak
 
        cd "${S}"/wmake/rules
@@ -353,4 +369,5 @@ src_install() {
        fi
 
        dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/.${MY_P}/bashrc /usr/$(get_libdir)/${MY_PN}/bashrc
+       dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/.${MY_P}/cshrc /usr/$(get_libdir)/${MY_PN}/cshrc
 }