]> Pileus Git - ~andy/sunrise/commitdiff
sci-libs/openfoam: Dependencies updated
authorOliver Borm (oli) <oli.borm@web.de>
Tue, 29 Jan 2008 19:20:41 +0000 (19:20 +0000)
committerOliver Borm (oli) <oli.borm@web.de>
Tue, 29 Jan 2008 19:20:41 +0000 (19:20 +0000)
svn path=/sunrise/; revision=5556

sci-libs/openfoam/ChangeLog
sci-libs/openfoam/Manifest
sci-libs/openfoam/openfoam-1.4.1_p20071028.ebuild
sci-libs/openfoam/openfoam-1.4.1_p20080118.ebuild

index f7ccdd02ad3a8b684a42b9126a93e303cf942e35..46248395ec6afd7ded4611dcbb87addd516e8d72 100644 (file)
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jan 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  openfoam-1.4.1_p20071028.ebuild, openfoam-1.4.1_p20080118.ebuild:
+  Dependencies updated
+
   22 Jan 2008; Oliver Borm (boroli) <oli.borm@web.de>
   +files/openfoam-1.4.1_p20080118.patch,
   +files/compile-1.4.1_p20080118.patch, +openfoam-1.4.1_p20080118.ebuild:
index e4c679fdf4bd920ffdaab76e4380246484c02d14..68f4e21d0f972fa60240125955fec297c071a937 100644 (file)
@@ -5,7 +5,7 @@ AUX openfoam-1.4.1_p20071028.patch 599007 RMD160 5f50b78e8e28cf734ac1c6f14c36237
 AUX openfoam-1.4.1_p20080118.patch 620098 RMD160 8e3e5ee7b6b9248191b0a1ae990ade9df1d7ea36 SHA1 9d0e7ab8fe5432d3601ac616d16b2000e7fa2607 SHA256 fee1c43d5bad63a2fa929556c2850377c084e9508a282f67979a5514445e4de1
 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 15683 RMD160 825e45da497e7beb34a4cb05c3c51c6277a659ef SHA1 725afeff86ed13b1e6a2f0af115ca78c19125bc4 SHA256 7171bbf0c53b0dd15eb0b6311b974686124bbf21e0363bac4c466fd80226367c
-EBUILD openfoam-1.4.1_p20080118.ebuild 10200 RMD160 7f5582ec9667a689a367004a727184173fee2492 SHA1 c1dfcd77d716bddf17e680bce3475fd25a1e450f SHA256 dd10816f0a720def7b21e208663dae7044ae7a4891608a1f38fa7fb3f3f82b8e
-MISC ChangeLog 1496 RMD160 5a48d9c2771a7ed619e5360aa6bfc7eb1f7d2cab SHA1 fbf4856f7372ce6d72884307a439b3ba35a20292 SHA256 56bc783e180c63cafaa6b2de98fdc59c59d9c0303b084a8ac48314947d2106db
+EBUILD openfoam-1.4.1_p20071028.ebuild 15365 RMD160 d8d8c7b820937a1e594715985e5d81d230a11b8a SHA1 f03f81bf81404c6c6f63a6ce91ea2bebef4887f1 SHA256 84fde63a02789a32d6e82b08c1df3fa039e3ea2819303519fff9a4e0460c67f0
+EBUILD openfoam-1.4.1_p20080118.ebuild 10162 RMD160 9a83ad60c934dcb6b27b14cf9230c2e6251b63e0 SHA1 c2055ca2f48541c27a548c1cdd95749aee9a8d8f SHA256 f4f9076b364268203a698785a6ba1999ba1966d0d87b5930e60d71f03c926b8d
+MISC ChangeLog 1642 RMD160 81c03c6de6150ed9323c2c92cc651eba52a96388 SHA1 14685b160fb7cc4f283b48d4a763ef122522f84d SHA256 36650f52e269676f1dcb9d85641a3161b4f9db6efdb06e9f02af97f92ae79a7a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
index e3143fd8ef1f4ae2df4b8c1faf32571c9d89b820..fd64aa575b85e69e8de407ca91db0a0568282271 100644 (file)
@@ -9,7 +9,6 @@ MY_PV=$(get_version_component_range 1-3 ${PV})
 MY_P="${MY_PN}-${MY_PV}"
 MY_PARA_PV="2.6.2"
 MY_PARA_PV_SHORT=$(get_version_component_range 1-2 ${MY_PARA_PV})
-#MY_PARA_PV_SHORT="2.6"
 
 DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
@@ -18,14 +17,18 @@ SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc examples lam mico mpich metis parafoam hdf5 mpi python threads"
-
-RDEPEND="dev-java/sun-java3d-bin
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples lam mpich metis parafoam hdf5 mpi python threads"
+
+RDEPEND="!sci-libs/openfoam-bin
+       !sci-libs/openfoam-kernel
+       !sci-libs/openfoam-meta
+       !sci-libs/openfoam-solvers
+       !sci-libs/openfoam-utilities
+       !sci-libs/openfoam-wmake
+       dev-java/sun-java3d-bin
        net-misc/openssh
-       mico? ( net-misc/mico )
-       sys-libs/readline
-       sys-libs/zlib
+       net-misc/mico
        <virtual/jdk-1.5
        !mpich? ( !lam? ( sys-cluster/openmpi ) )
        lam? ( sys-cluster/lam-mpi )
@@ -33,7 +36,7 @@ RDEPEND="dev-java/sun-java3d-bin
        metis? ( sci-libs/metis sci-libs/metis sci-libs/parmetis )
        parafoam? ( sci-libs/vtk
                =sci-visualization/paraview-${MY_PARA_PV} )
-       !parafoam? ( sci-visualization/paraview )"
+       !parafoam? ( <sci-visualization/paraview-3.0 )"
 
 DEPEND="${RDEPEND}
        parafoam? ( dev-util/cmake dev-libs/expat )"
@@ -42,53 +45,44 @@ PVSOURCEDIR="${WORKDIR}/paraview-${MY_PARA_PV}"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-       if [[ $(gcc-major-version) -lt 4 && $(gcc-minor-version) -lt 1 ]] ; then
+       if ! version_is_at_least 4.1 $(gcc-version) ; then
                die "${PN} requires >=sys-devel/gcc-4.1 to compile."
        fi
 
        if use parafoam ; then
-               ewarn
-               ewarn " You are building OpenFOAM with parafoam enabled, this means "
-               ewarn " that you are only building the vtkFoam and PVFoamReader libraries. "
-               ewarn " It is highly recommended to *DISABLE* this USE-Flag and use instead "
-               ewarn " the native OpenFOAM support in ParaView-${MY_PARA_PV}: "
-               ewarn " You have to open the controlDict file of each case and "
-               ewarn " choose the OpenFOAM filter for the controlDict files. "
-               ewarn
+               elog
+               elog " You are building OpenFOAM with parafoam enabled, this means "
+               elog " that you are only building the vtkFoam and PVFoamReader libraries. "
+               elog " It is highly recommended to *DISABLE* this USE-Flag and use instead "
+               elog " the native OpenFOAM support in ParaView-${MY_PARA_PV}: "
+               elog " You have to open the controlDict file of each case and "
+               elog " choose the OpenFOAM filter for the controlDict files. "
        else
-               ewarn
-               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 "
-               ewarn " choose the OpenFOAM filter for the controlDict files. "
-               ewarn
-       fi
-
-       if ! use mico ; then
-               ewarn
-               ewarn " You are building OpenFOAM without the mico USE-Flag, that means "
-               ewarn " you build against the mico that is shipped with OpenFOAM. "
-               ewarn " It is highly recommended to enable the mico USE-Flag and "
-               ewarn " build against a system wide mico. "
-               ewarn " At the moment there is no mico ebuild in the official portage tree, "
-               ewarn " but Bug 122141 provides an working ebuild. "
-               ewarn
+               elog
+               elog " You are building with parafoam disabled, this means "
+               elog " that paraFoam will not be installed. "
+               elog " You have to use instead the native OpenFOAM support in ParaView-${MY_PARA_PV}: "
+               elog " You have to open the controlDict file of each case and "
+               elog " choose the OpenFOAM filter for the controlDict files. "
        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
+               elog
+               elog " In order to use OpenFOAM you should add the following lines to ~/.bashrc :"
+               elog ' WM_64="on"'
+               elog " source /usr/$(get_libdir)/OpenFOAM/bashrc"
        else
-               einfo
-               einfo "In order to use OpenFOAM you should add the following line to ~/.bashrc :"
-               einfo "source /usr/$(get_libdir)/OpenFOAM/bashrc"
-               einfo
+               elog
+               elog " In order to use OpenFOAM you should add the following line to ~/.bashrc :"
+               elog " source /usr/$(get_libdir)/OpenFOAM/bashrc"
        fi
 
+       elog
+       elog " In order to get FoamX running, you have to do the following: "
+       elog " mkdir -p ~/.${MY_P}/apps "
+       elog " cp -r /usr/$(get_libdir)/${MY_PN}/${MY_P}/.${MY_P}/apps/FoamX ~/.${MY_P}/apps "
+       elog
+
        java-pkg-2_pkg_setup
 }
 
@@ -104,10 +98,9 @@ src_unpack() {
        fi
 
        cd "${S}"
-       epatch "${FILESDIR}"/${P}.patch || die "could not patch"
-       epatch "${FILESDIR}"/compile-${MY_PV}.patch || die "could not patch"
-
-       use mico && epatch "${FILESDIR}"/mico-${MY_PV}.patch
+       epatch "${FILESDIR}"/${P}.patch
+       epatch "${FILESDIR}"/compile-${MY_PV}.patch
+       epatch "${FILESDIR}"/mico-${MY_PV}.patch
 }
 
 src_compile() {
@@ -201,17 +194,15 @@ src_compile() {
                -e "s|[^#]setenv LD_LIBRARY_PATH|# setenv LD_LIBRARY_PATH|"     \
                        "${S}"/."${MY_P}"/apps/paraview/cshrc
 
-       if use mico ; then
-               sed -i -e 's|MICO_VERSION=|MICO_VERSION=`/usr/bin/mico-config --version` # |'   \
-                       -e "s|[^#]export MICO_PATH=|# export MICO_PATH=|"       \
-                       -e "s|MICO_ARCH_PATH=|MICO_ARCH_PATH=/usr # |"  \
-                       "${S}"/.bashrc
+       sed -i -e 's|MICO_VERSION=|MICO_VERSION=`/usr/bin/mico-config --version` # |'   \
+               -e "s|[^#]export MICO_PATH=|# export MICO_PATH=|"       \
+               -e "s|MICO_ARCH_PATH=|MICO_ARCH_PATH=/usr # |"  \
+               "${S}"/.bashrc
 
-               sed -i -e 's|MICO_VERSION |MICO_VERSION `/usr/bin/mico-config --version` # |'   \
-                       -e "s|[^#]setenv MICO_PATH |# setenv MICO_PATH |"       \
-                       -e "s|MICO_ARCH_PATH |MICO_ARCH_PATH /usr # |"  \
-                       "${S}"/.cshrc
-       fi
+       sed -i -e 's|MICO_VERSION |MICO_VERSION `/usr/bin/mico-config --version` # |'   \
+               -e "s|[^#]setenv MICO_PATH |# setenv MICO_PATH |"       \
+               -e "s|MICO_ARCH_PATH |MICO_ARCH_PATH /usr # |"  \
+               "${S}"/.cshrc
 
        if use metis ; then
                sed -i -e "s|-lmetis \\\|-L/usr/$(get_libdir) -lmetis|" \
@@ -317,7 +308,7 @@ src_compile() {
        . "${S}"/.${MY_P}/bashrc.bak
 
        cd "${S}"/wmake/rules
-       ln -sf ${WM_ARCH}Gcc $WM_ARCH${WM_COMPILER} || die "dosym wmake linux64 failed"
+       ln -sf ${WM_ARCH}Gcc $WM_ARCH${WM_COMPILER} || die "dosym wmake linuxXX failed"
 
        cd "${S}"
        ./Allwmake || die "could not build"
@@ -363,10 +354,8 @@ src_install() {
        insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications
        doins -r applications/solvers applications/test applications/utilities
 
-       if use doc ; then
-               insinto /usr/share/${MY_PN}/${MY_P}/doc
-               doins -r README doc/Guides-a4 doc/Guides-usletter
-       fi
+       insinto /usr/share/${MY_PN}/${MY_P}/doc
+       doins -r README doc/Guides-a4 doc/Guides-usletter
 
        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
index 7f00019fcd981ff3f6e39f152800ccd36dc474fb..9ada678dc7ad911790aa4a862cefaf52b7b7203b 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
-inherit eutils java-pkg-2 versionator python multilib toolchain-funcs
+inherit eutils java-pkg-2 versionator multilib toolchain-funcs
 
 MY_PN="OpenFOAM"
 MY_PV=$(get_version_component_range 1-3 ${PV})
@@ -18,11 +18,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples lam mpich metis"
 
 RDEPEND="!sci-libs/openfoam-bin
+       !sci-libs/openfoam-kernel
+       !sci-libs/openfoam-meta
+       !sci-libs/openfoam-solvers
+       !sci-libs/openfoam-utilities
+       !sci-libs/openfoam-wmake
        dev-java/sun-java3d-bin
        net-misc/openssh
        net-misc/mico
-       sys-libs/readline
-       sys-libs/zlib
        <virtual/jdk-1.5
        || ( >sci-visualization/paraview-3.0 sci-visualization/opendx )
        !mpich? ( !lam? ( sys-cluster/openmpi ) )
@@ -34,6 +37,10 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+       if use lam && use mpich ; then
+               die "Please choose only one MPI implementation as default."
+       fi
+
        if ! version_is_at_least 4.1 $(gcc-version) ; then
                die "${PN} requires >=sys-devel/gcc-4.1 to compile."
        fi
@@ -81,7 +88,6 @@ src_compile() {
        sed -i -e "s|WM_PROJECT_VERSION=|WM_PROJECT_VERSION=${MY_PV} #|"        \
                -e "s|export WM_PROJECT_INST_DIR=\$HOME/\$WM_PROJECT|# export WM_PROJECT_INST_DIR=\$HOME/\$WM_PROJECT|" \
                -e "s|#export WM_PROJECT_INST_DIR=/usr/local/\$WM_PROJECT|export WM_PROJECT_INST_DIR=/usr/$(get_libdir)/\$WM_PROJECT|"  \
-               -e "s|WM_COMPILER=Gcc|WM_COMPILER=|"    \
                -e "s|[^#]export WM_MPLIB=| #export WM_MPLIB=|" \
                -e "s|#export WM_MPLIB=$|export WM_MPLIB="${WM_MPLIB}"|" \
                -e "s|SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|#SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|"        \
@@ -90,7 +96,6 @@ src_compile() {
        sed -i -e "s|WM_PROJECT_VERSION |WM_PROJECT_VERSION ${MY_PV} #|"        \
                -e "s|setenv WM_PROJECT_INST_DIR \$HOME/\$WM_PROJECT|# setenv WM_PROJECT_INST_DIR \$HOME/\$WM_PROJECT|" \
                -e "s|#setenv WM_PROJECT_INST_DIR /usr/local/\$WM_PROJECT|setenv WM_PROJECT_INST_DIR /usr/$(get_libdir)/\$WM_PROJECT|"  \
-               -e "s|WM_COMPILER Gcc|WM_COMPILER |"    \
                -e "s|[^#]setenv WM_MPLIB | #setenv WM_MPLIB |" \
                -e "s|#setenv WM_MPLIB OPENMPI|setenv WM_MPLIB "${WM_MPLIB}"|" \
                -e "s|SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|#SOURCE \$WM_PROJECT_DIR/\$FOAM_DOT_DIR/apps|"        \
@@ -186,9 +191,6 @@ src_compile() {
 
        source "${S}"/.${MY_P}/bashrc.bak
 
-       cd "${S}"/wmake/rules
-       ln -sf ${WM_ARCH}Gcc $WM_ARCH${WM_COMPILER} || die "dosym wmake linuxXX failed"
-
        find "${S}"/wmake -name dirToString | xargs rm -rf
        find "${S}"/wmake -name wmkdep | xargs rm -rf
 
@@ -201,7 +203,6 @@ src_compile() {
        sed -i -e "s|/\$WM_OPTIONS||" "${S}"/.bashrc || die "could not delete \$WM_OPTIONS in .bashrc"
        sed -i -e "s|/\$WM_OPTIONS||" "${S}"/.cshrc || die "could not delete \$WM_OPTIONS in .cshrc"
        rm "${S}"/applications/utilities/mesh/conversion/ccm26ToFoam/libccmio/config/{irix64_6.5-mips4,irix_6.5-mips3,sunos64_5.8-ultra,linux64_2.6-pwr4-glibc_2.3.3}/qmake
-       rm "${S}"/wmake/rules/$WM_ARCH${WM_COMPILER}
 }
 
 src_test() {
@@ -217,6 +218,7 @@ src_install() {
 
        insopts -m0755
        doins -r bin
+
        insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications/bin
        doins -r applications/bin/${WM_OPTIONS}/*