sci-libs/openfoam-bin: Version bump to 1.5 for bug 104257

svn path=/sunrise/; revision=6548

4 files changed, 563 insertions, 1 deletions

diff --git a/sci-libs/openfoam-bin/ChangeLog b/sci-libs/openfoam-bin/ChangeLog
index def627979..e36270ff5 100644
--- a/sci-libs/openfoam-bin/ChangeLog
+++ b/sci-libs/openfoam-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jul 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  +openfoam-bin-1.5.ebuild, +files/OpenFOAM-1.5-compile.patch:
+  Version bump to 1.5 for bug 104257
+
   27 Mar 2008; Markus Ullmann <jokey@gentoo.org>
   -openfoam-bin-1.4.1_p20080118.patch:
   Move patch to dev.ge.org
diff --git a/sci-libs/openfoam-bin/Manifest b/sci-libs/openfoam-bin/Manifest
index 703813180..553f9e5eb 100644
--- a/sci-libs/openfoam-bin/Manifest
+++ b/sci-libs/openfoam-bin/Manifest
@@ -1,8 +1,13 @@
+AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89
 AUX compile-1.4.1.patch 7139 RMD160 d7ec0d67ffd5515347d901ab98f6f662f410d431 SHA1 f8a7dc555da810f9a39f7ceba217fcf594941de6 SHA256 0519fe7aa1108e6601ec50405b96770a00f6b27d6109d1c56687059ff908323e
 DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
 DIST OpenFOAM-1.4.1.linux64GccDPOpt.gtgz 61779964 RMD160 43d8e8200cc35aa5a2a77554ffaa7c60939cb44e SHA1 b98b978aa6e69427c3867776b5af0ead1cacc64f SHA256 1885b3afb55e68a1db046a28ec144ba52eb0bc6aa158d96bd3cac7402e81a51b
 DIST OpenFOAM-1.4.1.linuxGccDPOpt.gtgz 58886901 RMD160 8e98404fe737a2426650760b1a160d951ef46fa4 SHA1 cf67a320cbc2d244cf35cfda7f6f2e0fd6978c40 SHA256 bfc75e7b0abfb31dae2ce4f15b4f8b56735e02683411ba00289a0893f45e89a1
+DIST OpenFOAM-1.5.General.gtgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
+DIST OpenFOAM-1.5.linux64GccDPOpt.gtgz 38257988 RMD160 6a678c3fdbbc788d4369ee32358546f3d9e51d04 SHA1 542fd21b6258820fea88ce8378abddd7a175e061 SHA256 9bf374239bf87e25a34d2dbc45b0b6cb2922358a7c6623899364a2cb5b329324
+DIST OpenFOAM-1.5.linuxGccDPOpt.gtgz 35208751 RMD160 44d0ffabc250275e3a03948404775d062ca430ea SHA1 ce035ce82523d480375d0ef187c0ccd3a49e4b70 SHA256 949b0bc4e2391077c12199bbcf0f34ad65ce028f0dd8d334543f22a9a20f7592
 DIST openfoam-bin-1.4.1_p20080118.patch.bz2 136972 RMD160 cf82b9c9973072b8f7319da7b87ad7bf1ff8bcd4 SHA1 3421850559d6d27d747f7c1bd2dbcd1603c4212a SHA256 f87c89d780ec4d74bed451aca855b67633ec971ad8a40782e849d0dc8190b50b
 EBUILD openfoam-bin-1.4.1_p20080118.ebuild 8306 RMD160 786896746488336c4539e1ef934623eb41a0513d SHA1 8fd7a628d878b29330388d0766ce3e90fa3501c4 SHA256 552406b7f8282e113bc2b78b1115b3e4dbb417cbfdacc8c341722d8805f42e1c
-MISC ChangeLog 602 RMD160 320334c2289af9d3237dc9354d811b53b48d2e28 SHA1 177d4ebc86e3e9e52659235b19cdc2392cc19c87 SHA256 11923beca88f8f607dba9175a95a142caa4f89514448efb8296f69cad540d173
+EBUILD openfoam-bin-1.5.ebuild 3246 RMD160 9392255fb7efecf484b4a032f9b0c6a7f88621da SHA1 7d66b6fe2a0d74d48b691871378dbe0270960b76 SHA256 3e9b531d491930fd8df9b2e09122da4e0c2bee79ceabb5ea84d70e3cb06b6c72
+MISC ChangeLog 757 RMD160 1477c5485eae777cea863fe34cfdf1867908a44a SHA1 f825fabe87a5afe73d793d6eda182f971eefe836 SHA256 6ac07c12e1ecf4cbd29aeada2d6886a780ab68ce3fbb36bfc877d2097f113bd7
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sci-libs/openfoam-bin/files/OpenFOAM-1.5-compile.patch b/sci-libs/openfoam-bin/files/OpenFOAM-1.5-compile.patch
new file mode 100644
index 000000000..4479cb384
--- /dev/null
+++ b/sci-libs/openfoam-bin/files/OpenFOAM-1.5-compile.patch
@@ -0,0 +1,436 @@
+--- OpenFOAM-1.5-src/etc/bashrc	2008-07-09 19:08:57.000000000 +0200
++++ OpenFOAM-1.5/etc/bashrc	2008-07-21 23:07:48.000000000 +0200
+@@ -42,9 +42,9 @@
+ #
+ # Location of FOAM installation
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-foamInstall=$HOME/$WM_PROJECT
++# foamInstall=$HOME/$WM_PROJECT
+ # foamInstall=~$WM_PROJECT
+-# foamInstall=/usr/local/$WM_PROJECT
++foamInstall=/usr/lib/$WM_PROJECT
+ # foamInstall=/opt/$WM_PROJECT
+ 
+ : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR
+@@ -59,7 +59,7 @@
+ 
+ # Location of third-party software
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
++# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
+ 
+ 
+ # Operating System/Platform from Unix or MSWindows
+@@ -192,15 +192,15 @@
+ 
+ 
+ _foamSource $WM_PROJECT_DIR/etc/settings.sh
+-_foamSource $WM_PROJECT_DIR/etc/aliases.sh
++# _foamSource $WM_PROJECT_DIR/etc/aliases.sh
+ 
+ 
+ # Source user setup files for optional packages
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
+-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
++# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
+ # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc
+-_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
++# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
+ 
+ 
+ # Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)
+--- OpenFOAM-1.5-src/etc/settings.sh	2008-06-27 13:19:25.000000000 +0200
++++ OpenFOAM-1.5/etc/settings.sh	2008-07-21 00:50:00.000000000 +0200
+@@ -56,30 +56,30 @@
+ export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH
+ 
+ #- Location of the jobControl directory
+-export FOAM_JOB_DIR=$FOAM_INST_DIR/jobControl
++export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl
+ 
+ export WM_DIR=$WM_PROJECT_DIR/wmake
+ export WM_LINK_LANGUAGE=c++
+-export WM_OPTIONS=$WM_ARCH${WM_COMPILER}$WM_PRECISION_OPTION$WM_COMPILE_OPTION
++export WM_OPTIONS=$WM_ARCH${WM_COMPILER}
+ export PATH=$WM_DIR:$PATH
+ 
+ export FOAM_SRC=$WM_PROJECT_DIR/src
+ export FOAM_LIB=$WM_PROJECT_DIR/lib
+-export FOAM_LIBBIN=$FOAM_LIB/$WM_OPTIONS
++export FOAM_LIBBIN=$FOAM_LIB
+ _foamAddLib $FOAM_LIBBIN
+ 
+ export FOAM_APP=$WM_PROJECT_DIR/applications
+-export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
++export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin
+ _foamAddPath $FOAM_APPBIN
+ 
+ export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
+ export FOAM_UTILITIES=$FOAM_APP/utilities
+ export FOAM_SOLVERS=$FOAM_APP/solvers
+ 
+-export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
++export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib
+ _foamAddLib $FOAM_USER_LIBBIN
+ 
+-export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
++export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin
+ _foamAddPath $FOAM_USER_APPBIN
+ 
+ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
+@@ -93,7 +93,7 @@
+ # Select compiler installation
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ # WM_COMPILER_INST = OpenFOAM | System
+-WM_COMPILER_INST=OpenFOAM
++WM_COMPILER_INST=System
+ 
+ case "$WM_COMPILER_INST" in
+ OpenFOAM)
+@@ -136,45 +136,47 @@
+ 
+ case "$WM_MPLIB" in
+ OPENMPI)
+-    mpi_version=openmpi-1.2.6
+-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
+-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
+-
++    MPI_VERSION=openmpi
++#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
++#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
++    export MPI_ARCH_PATH=/usr
+     # Tell OpenMPI where to find its install directory
+     export OPAL_PREFIX=$MPI_ARCH_PATH
+ 
+-    _foamAddLib  $MPI_ARCH_PATH/lib
+-    _foamAddPath $MPI_ARCH_PATH/bin
++#     _foamAddLib  $MPI_ARCH_PATH/lib
++#     _foamAddPath $MPI_ARCH_PATH/bin
+ 
+-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+-    unset mpi_version
++    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
++#     unset mpi_version
+     ;;
+ 
+ LAM)
+-    mpi_version=lam-7.1.4
+-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
+-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
+-    export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
++    MPI_VERSION=lam
++#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
++#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
++    export MPI_ARCH_PATH=/usr
++#     export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
+     # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
+ 
+-    _foamAddLib  $MPI_ARCH_PATH/lib
+-    _foamAddPath $MPI_ARCH_PATH/bin
++#     _foamAddLib  $MPI_ARCH_PATH/lib
++#     _foamAddPath $MPI_ARCH_PATH/bin
+ 
+-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+-    unset mpi_version
++    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
++#     unset mpi_version
+     ;;
+ 
+ MPICH)
+-    mpi_version=mpich-1.2.4
+-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
+-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
++    MPI_VERSION=mpich
++#     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
++#     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
++    export MPI_ARCH_PATH=/usr
+     export MPICH_ROOT=$MPI_ARCH_PATH
+ 
+-    _foamAddLib  $MPI_ARCH_PATH/lib
+-    _foamAddPath $MPI_ARCH_PATH/bin
++#     _foamAddLib  $MPI_ARCH_PATH/lib
++#     _foamAddPath $MPI_ARCH_PATH/bin
+ 
+-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+-    unset mpi_version
++    export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION
++#     unset mpi_version
+     ;;
+ 
+ MPICH-GM)
+--- OpenFOAM-1.5-src/etc/cshrc	2008-07-09 19:09:28.000000000 +0200
++++ OpenFOAM-1.5/etc/cshrc	2008-07-20 22:31:22.000000000 +0200
+@@ -58,7 +58,7 @@
+ 
+ # Location of third-party software
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
++# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
+ 
+ 
+ # Operating System/Platform from Unix or MSWindows
+@@ -188,12 +188,12 @@
+ alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*'
+ 
+ _foamSource $WM_PROJECT_DIR/etc/settings.csh
+-_foamSource $WM_PROJECT_DIR/etc/aliases.csh
++# _foamSource $WM_PROJECT_DIR/etc/aliases.csh
+ 
+ # Source user setup files for optional packages
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
+-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
++# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
+ # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc
+ 
+ 
+--- OpenFOAM-1.5-src/etc/settings.csh	2008-06-27 13:19:25.000000000 +0200
++++ OpenFOAM-1.5/etc/settings.csh	2008-07-20 23:14:59.000000000 +0200
+@@ -39,30 +39,30 @@
+ set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path)
+ 
+ #- Location of the jobControl directory
+-setenv FOAM_JOB_DIR $FOAM_INST_DIR/jobControl
++setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl
+ 
+ setenv WM_DIR $WM_PROJECT_DIR/wmake
+ setenv WM_LINK_LANGUAGE c++
+-setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
++setenv WM_OPTIONS $WM_ARCH$WM_COMPILER
+ set path=($WM_DIR $path)
+ 
+ setenv FOAM_SRC $WM_PROJECT_DIR/src
+ setenv FOAM_LIB $WM_PROJECT_DIR/lib
+-setenv FOAM_LIBBIN $FOAM_LIB/$WM_OPTIONS
++setenv FOAM_LIBBIN $FOAM_LIB
+ _foamAddLib $FOAM_LIBBIN
+ 
+ setenv FOAM_APP $WM_PROJECT_DIR/applications
+-setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
++setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin
+ _foamAddPath $FOAM_APPBIN
+ 
+ setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
+ setenv FOAM_UTILITIES $FOAM_APP/utilities
+ setenv FOAM_SOLVERS $FOAM_APP/solvers
+ 
+-setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
++setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib
+ _foamAddLib $FOAM_USER_LIBBIN
+ 
+-setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
++setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin
+ _foamAddPath $FOAM_USER_APPBIN
+ 
+ setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
+@@ -76,7 +76,7 @@
+ # Select compiler installation
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ # WM_COMPILER_INST = OpenFOAM | System
+-set WM_COMPILER_INST=OpenFOAM
++set WM_COMPILER_INST=System
+ 
+ switch ("$WM_COMPILER_INST")
+ case OpenFOAM:
+@@ -125,45 +125,48 @@
+ 
+ switch ("$WM_MPLIB")
+ case OPENMPI:
+-    set mpi_version=openmpi-1.2.6
+-    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
+-    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
++#     set mpi_version=openmpi-1.2.6
++#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
++#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
++    setenv MPI_ARCH_PATH /usr
+ 
+     # Tell OpenMPI where to find its install directory
+     setenv OPAL_PREFIX $MPI_ARCH_PATH
+ 
+-    _foamAddLib  $MPI_ARCH_PATH/lib
+-    _foamAddPath $MPI_ARCH_PATH/bin
++#     _foamAddLib  $MPI_ARCH_PATH/lib
++#     _foamAddPath $MPI_ARCH_PATH/bin
+ 
+-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+-    unset mpi_version
++    setenv FOAM_MPI_LIBBIN $FOAM_LIB/openmpi
++#     unset mpi_version
+     breaksw
+ 
+ case LAM:
+-    set mpi_version=lam-7.1.4
+-    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
+-    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
+-    setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
++#     set mpi_version=lam-7.1.4
++#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
++#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
++    setenv MPI_ARCH_PATH /usr
++#     setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
+     # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
+ 
+-    _foamAddLib  $MPI_ARCH_PATH/lib
+-    _foamAddPath $MPI_ARCH_PATH/bin
++#     _foamAddLib  $MPI_ARCH_PATH/lib
++#     _foamAddPath $MPI_ARCH_PATH/bin
+ 
+-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+-    unset mpi_version
++    setenv FOAM_MPI_LIBBIN $FOAM_LIB/lam
++#     unset mpi_version
+     breaksw
+ 
+ case MPICH:
+-    set mpi_version=mpich-1.2.4
+-    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
+-    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
++#     set mpi_version=mpich-1.2.4
++#     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
++#     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
++    setenv MPI_ARCH_PATH /usr
+     setenv MPICH_ROOT $MPI_ARCH_PATH
+ 
+-    _foamAddLib  $MPI_ARCH_PATH/lib
+-    _foamAddPath $MPI_ARCH_PATH/bin
++#     _foamAddLib  $MPI_ARCH_PATH/lib
++#     _foamAddPath $MPI_ARCH_PATH/bin
+ 
+-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+-    unset mpi_version
++    setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich
++#     unset mpi_version
+     breaksw
+ 
+ case MPICH-GM:
+--- OpenFOAM-1.5-src/wmake/rules/General/flex++	2008-05-01 16:16:40.000000000 +0200
++++ OpenFOAM-1.5/wmake/rules/General/flex++	2008-07-22 16:18:41.000000000 +0200
+@@ -1,6 +1,6 @@
+ .SUFFIXES: .L
+ 
+-Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
++Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
+ 
+ .L.dep:
+ 	$(MAKE_DEP)
+--- OpenFOAM-1.5-src/wmake/Makefile	2008-06-27 13:19:31.000000000 +0200
++++ OpenFOAM-1.5/wmake/Makefile	2008-07-20 23:06:27.000000000 +0200
+@@ -56,7 +56,7 @@
+ 
+ LIB_SRC            = $(WM_PROJECT_DIR)/src
+ LIB_DIR            = $(WM_PROJECT_DIR)/lib
+-LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
++LIB_WM_OPTIONS_DIR = $(LIB_DIR)
+ OBJECTS_DIR        = $(MAKE_DIR)/$(WM_OPTIONS)
+ CLASSES_DIR        = $(MAKE_DIR)/classes
+ 
+--- OpenFOAM-1.5-src/bin/paraFoam	2008-07-03 18:14:43.000000000 +0200
++++ OpenFOAM-1.5/bin/paraFoam	2008-07-22 15:23:24.000000000 +0200
+@@ -77,8 +77,8 @@
+    [ -s "$parentDir/$check" ] || usage "file does not exist:  '$parentDir/$check'"
+ done
+ 
+-#caseFile="$caseName.foam"
+-caseFile="$caseName.OpenFOAM"
++caseFile="$caseName.foam"
++# caseFile="$caseName.OpenFOAM"
+ 
+ case "$ParaView_VERSION" in
+ 2*)
+@@ -96,7 +96,7 @@
+ *)
+    # Clean up on termination and on Ctrl-C
+    trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
+-   touch $caseFile
++   ln system/controlDict $caseFile
+    paraview --data=$caseFile
+    ;;
+ 
+--- OpenFOAM-1.5-src/src/decompositionAgglomeration/decompositionMethods/Make/options	2008-06-09 16:22:09.000000000 +0200
++++ OpenFOAM-1.5/src/decompositionAgglomeration/decompositionMethods/Make/options	2008-07-20 22:19:30.000000000 +0200
+@@ -1,6 +1,5 @@
+ EXE_INC = \
+-    -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include
++    -I/usr/include/metis
+ 
+ LIB_LIBS = \
+-    -lmetis \
+-    -lGKlib
++    -lmetis
+--- OpenFOAM-1.5-src/src/decompositionAgglomeration/parMetisDecomp/Make/options	2008-06-09 16:23:55.000000000 +0200
++++ OpenFOAM-1.5/src/decompositionAgglomeration/parMetisDecomp/Make/options	2008-07-20 22:24:04.000000000 +0200
+@@ -2,11 +2,11 @@
+ 
+ EXE_INC = \
+     $(PFLAGS) $(PINC) \
+-    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \
+-    -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \
++    -I/usr/include/parmetis \
++    -I/usr/include/metis \
+     -I../decompositionMethods/lnInclude
+ 
+ LIB_LIBS = \
+     -L$(FOAM_MPI_LIBBIN) \
+-    -lmetis-parmetis \
++    -lmetis \
+     -lparmetis
+--- OpenFOAM-1.5-src/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options	2008-06-09 16:22:37.000000000 +0200
++++ OpenFOAM-1.5/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options	2008-07-21 20:45:42.000000000 +0200
+@@ -1,5 +1,3 @@
+-ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0
+-
+ TYPE_REAL=
+ #if defined(SP)
+ TYPE_REAL=-DTYPE_REAL
+@@ -7,9 +5,9 @@
+ 
+ EXE_INC = \
+     -I$(LIB_SRC)/finiteVolume/lnInclude \
+-    -I$(ParMGridGen)/MGridGen/Lib/lnInclude \
+-    -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \
++    -I/usr/include/mgridgen \
+     $(TYPE_REAL)
+ 
+ LIB_LIBS = \
++    -lIMlib \
+     -lMGridGen
+--- OpenFOAM-1.5-src/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C	2008-07-09 10:43:41.000000000 +0200
++++ OpenFOAM-1.5/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C	2008-07-21 22:02:55.000000000 +0200
+@@ -240,6 +240,7 @@
+         // ~~~~~~~~~~~~~~~~~~~~~~~~~
+         // Only look at surface intersections (minLevel and surface curvature),
+         // do not do internal refinement (refinementShells)
++PtrList<featureEdgeMesh> dummy(0);
+ 
+         labelList candidateCells
+         (
+@@ -248,7 +249,8 @@
+                 refineParams.keepPoints()[0],
+                 refineParams.curvature(),
+ 
+-                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
++//                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
++dummy, //dummy featureMeshes;
+                 labelList(0),                   // dummy featureLevels;
+ 
+                 false,              // featureRefinement
+@@ -382,6 +384,8 @@
+             << "----------------------------" << nl
+             << endl;
+ 
++PtrList<featureEdgeMesh> dummy(0);
++
+         labelList candidateCells
+         (
+             meshRefiner_.refineCandidates
+@@ -389,7 +393,8 @@
+                 refineParams.keepPoints()[0],
+                 refineParams.curvature(),
+ 
+-                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
++//                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
++dummy, // dummy featureMeshes;
+                 labelList(0),                   // dummy featureLevels;
+ 
+                 false,              // featureRefinement
diff --git a/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild b/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild
new file mode 100644
index 000000000..9fb9aee0f
--- /dev/null
+++ b/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+inherit eutils versionator multilib toolchain-funcs
+
+MY_PN="OpenFOAM"
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
+HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
+SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz
+	x86? ( mirror://sourceforge/foam/${MY_P}.linuxGccDPOpt.gtgz )
+	amd64? ( mirror://sourceforge/foam/${MY_P}.linux64GccDPOpt.gtgz )"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="examples doc"
+
+DEPEND="!sci-libs/openfoam
+	!sci-libs/openfoam-kernel
+	!sci-libs/openfoam-meta
+	!sci-libs/openfoam-solvers
+	!sci-libs/openfoam-utilities
+	!sci-libs/openfoam-wmake
+	|| ( >sci-visualization/paraview-3.0 sci-visualization/opendx )
+	virtual/mpi"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	if ! version_is_at_least 4.2 $(gcc-version) ; then
+		die "${PN} requires >=sys-devel/gcc-4.2 to compile."
+	fi
+
+	elog
+	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
+	elog "source /usr/$(get_libdir)/${MY_PN}/bashrc"
+	ewarn
+	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
+	ewarn
+
+	use x86 && WM_OPTIONS="linuxGccDPOpt"
+	use amd64 && WM_OPTIONS="linux64GccDPOpt"
+}
+
+src_unpack() {
+	ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz
+	unpack ./${MY_P}.General.tgz
+
+	use x86 && ln -s "${DISTDIR}"/${MY_P}.linuxGccDPOpt.gtgz ${MY_P}.binary.tgz
+	use amd64 && ln -s "${DISTDIR}"/${MY_P}.linux64GccDPOpt.gtgz ${MY_P}.binary.tgz
+	unpack ./${MY_P}.binary.tgz
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${MY_P}-compile.patch
+}
+
+src_compile() {
+	if has_version sys-cluster/lam-mpi ; then
+		export WM_MPLIB=LAM
+		export MPI_VERSION=lam
+	elif has_version sys-cluster/mpich2 ; then
+		export WM_MPLIB=MPICH
+		export MPI_VERSION=mpich
+	elif has_version sys-cluster/openmpi ; then
+		export WM_MPLIB=OPENMPI
+		export MPI_VERSION=openmpi
+	else
+		die "You need one of the following mpi implementations: openmpi, lam-mpi or mpich2"
+	fi
+
+	sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc
+	sed -i -e "s|setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" etc/cshrc
+
+	mv lib/${WM_OPTIONS}/$MPI_VERSION* lib/${WM_OPTIONS}/$MPI_VERSION
+}
+
+src_test() {
+	cd bin
+	./foamInstallationTest
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}
+	doins -r etc
+
+	rm -rf tutorials/rhoPorousSimpleFoam/angledDuctExplicit/{0,constant}
+	cp -a tutorials/rhoPorousSimpleFoam/angledDuctImplicit/{0,constant} tutorials/rhoPorousSimpleFoam/angledDuctExplicit
+	use examples && doins -r tutorials
+
+	insopts -m0755
+	doins -r bin
+
+	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications/bin
+	doins -r applications/bin/${WM_OPTIONS}/*
+
+	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/lib
+	doins -r lib/${WM_OPTIONS}/*
+
+	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/wmake
+	doins -r wmake/*
+
+	insopts -m0644
+	insinto /usr/share/doc/${PF}
+	doins doc/Guides-a4/*.pdf
+	dodoc README
+
+	if use doc ; then
+		dohtml -r doc/Doxygen
+	fi
+
+	dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/etc/bashrc /usr/$(get_libdir)/${MY_PN}/bashrc
+	dosym /usr/$(get_libdir)/${MY_PN}/${MY_P}/etc/cshrc /usr/$(get_libdir)/${MY_PN}/cshrc
+}