# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ -openfoam-utilities-1.4.1_p20080328.ebuild,
+ -files/openfoam-utilities-1.4.1_p20080328.patch,
+ -files/openfoam-utilities-compile-1.4.1_p20080328.patch:
+ Drop old version
+
28 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de>
+openfoam-utilities-1.4.1_p20080827.ebuild,
+files/openfoam-utilities-1.4.1_p20080827.patch,
AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89
-AUX openfoam-utilities-1.4.1_p20080328.patch 6357 RMD160 4022b04557ba6d7da87a7c44e26f300a77a922b2 SHA1 98c40c041ce5c04c1f3df1a5f07f85d91cb69ef4 SHA256 a4187c759e84a166b9fccbda4dcdad6f25c7b29da01a34209b4771394a4be11f
AUX openfoam-utilities-1.4.1_p20080827.patch 219964 RMD160 3b207a535e5978404d62976f38d26d0b4542443e SHA1 b564ca1dc2531bc15ceac06a31386e625d3f75e2 SHA256 01f6fdac61ca2ddbbf6c77e45b9f23d1d2ced617260b97710da22a5b4f4c04d1
-AUX openfoam-utilities-compile-1.4.1_p20080328.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
AUX openfoam-utilities-compile-1.4.1_p20080827.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
DIST OpenFOAM-1.5.General.gtgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
-EBUILD openfoam-utilities-1.4.1_p20080328.ebuild 4310 RMD160 0817be669c8dec4c3fa67f2103bec34c60ecbfd9 SHA1 ae43d8095accd00e97397c5067d60209dd9173f0 SHA256 0779f9ce3996ae8cc02911401520f7e4123abfa41cbbf9d6b7af8177f0f3c862
EBUILD openfoam-utilities-1.4.1_p20080827.ebuild 4310 RMD160 0817be669c8dec4c3fa67f2103bec34c60ecbfd9 SHA1 ae43d8095accd00e97397c5067d60209dd9173f0 SHA256 0779f9ce3996ae8cc02911401520f7e4123abfa41cbbf9d6b7af8177f0f3c862
EBUILD openfoam-utilities-1.5.ebuild 2194 RMD160 c72a0fd5da83a4c41ae2923bcc3fda49959459bc SHA1 312fc2064f041f315f06ed388eacf87a7d8589cc SHA256 920b09bfc513e9db6dac706bade7b23e1d3216d7a0ba8f5d03bc44ea1a74de02
-MISC ChangeLog 2097 RMD160 31df3cda57cb8d630b33436d1921100df87cbf1f SHA1 29348b5a232e43a87389b697e153c7d2473bd076 SHA256 77ffa79ce17186b539080480c316528efb01e2218e0c24d85cb43592bbb91196
+MISC ChangeLog 2332 RMD160 d07da05a27d70078ef6e6f3bef9c7532e923f6b3 SHA1 c1cccff4bdaaa5b117ed1f17ddf33c60dc64772e SHA256 00d173c1c7276306638c01509255d2989ad6b66c9bf6c2f1c109ede220e112a8
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+++ /dev/null
-Index: postProcessing/dataConversion/foamToVTK/writeFuns.C
-===================================================================
---- applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C (Revision 30)
-+++ applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C (Revision 569)
-@@ -229,14 +229,36 @@
- void Foam::writeFuns::insert(const vector& pt, DynamicList<floatScalar>& dest)
- {
- for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++)
- {
- dest.append(float(pt[cmpt]));
- }
- }
-+void Foam::writeFuns::insert
-+(
-+ const symmTensor& pt,
-+ DynamicList<floatScalar>& dest
-+)
-+{
-+ for (direction cmpt = 0; cmpt < symmTensor::nComponents; cmpt++)
-+ {
-+ dest.append(float(pt[cmpt]));
-+ }
-+}
-+void Foam::writeFuns::insert
-+(
-+ const sphericalTensor& pt,
-+ DynamicList<floatScalar>& dest
-+)
-+{
-+ for (direction cmpt = 0; cmpt < sphericalTensor::nComponents; cmpt++)
-+ {
-+ dest.append(float(pt[cmpt]));
-+ }
-+}
- void Foam::writeFuns::insert(const tensor& pt, DynamicList<floatScalar>& dest)
- {
- for (direction cmpt = 0; cmpt < tensor::nComponents; cmpt++)
- {
- dest.append(float(pt[cmpt]));
- }
- }
-Index: postProcessing/dataConversion/foamToVTK/writeFuns.H
-===================================================================
---- applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H (Revision 30)
-+++ applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H (Revision 569)
-@@ -167,14 +167,16 @@
- const label,
- const label
- );
-
- //- convert to VTK and store
- static void insert(const scalar&, DynamicList<floatScalar>& dest);
- static void insert(const point&, DynamicList<floatScalar>& dest);
-+ static void insert(const symmTensor&, DynamicList<floatScalar>& dest);
-+ static void insert(const sphericalTensor&, DynamicList<floatScalar>& dest);
- static void insert(const tensor&, DynamicList<floatScalar>& dest);
-
- //- Append elements to DynamicList
- static void insert(const labelList&, DynamicList<label>&);
- template<class Type>
- static void insert(const List<Type>&, DynamicList<floatScalar>&);
-
-
-Index: mesh/manipulation/Optional/Allwmake
-===================================================================
---- applications/utilities/mesh/manipulation/Optional/Allwmake (Revision 30)
-+++ applications/utilities/mesh/manipulation/Optional/Allwmake (Revision 569)
-@@ -1,11 +1,11 @@
- #!/bin/sh
-
- READLINE=0
- if [ -f /usr/include/readline/readline.h ]; then
- echo "Found readline/readline.h include file. Enabling readline support."
- READLINE=1
-- export READLINELINK="-lreadline"
-+ export READLINELINK="-lreadline -lcurses"
- break
- fi
- export READLINE
- wmake setSet
-
-Index: mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
-===================================================================
---- applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C (Revision 30)
-+++ applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C (Revision 569)
-@@ -276,26 +276,26 @@
- is.getLine(line);
- }
- else if (feID == 171)
- {
- // Rod. Skip.
- is.getLine(line);
- }
-- else if (feID == 41)
-+ else if (feID == 41 || feID == 91)
- {
- // Triangle. Save - used for patching later on.
- is.getLine(line);
-
- face cVerts(3);
- IStringStream lineStr(line);
- lineStr >> cVerts[0] >> cVerts[1] >> cVerts[2];
- boundaryFaces.append(cVerts);
- boundaryFaceIndices.append(cellI);
- }
-- else if (feID == 94)
-+ else if (feID == 44 || feID == 94)
- {
- // Quad. Save - used for patching later on.
- is.getLine(line);
-
- face cVerts(4);
- IStringStream lineStr(line);
- lineStr >> cVerts[0] >> cVerts[1] >> cVerts[2] >> cVerts[3];
-@@ -389,29 +389,38 @@
- faceIndices.setSize(nFaces);
- label faceI = 0;
-
- while (faceI < faceIndices.size())
- {
- is.getLine(line);
- IStringStream lineStr(line);
-- label typeCode1, tag1, nodeLeaf1, component1,
-- typeCode2, tag2, nodeLeaf2, component2;
-- lineStr
-- >> typeCode1 >> tag1 >> nodeLeaf1 >> component1
-- >> typeCode2 >> tag2 >> nodeLeaf2 >> component2;
-
-- if (typeCode1 != 8 || typeCode2 != 8)
-+ // Read one (for last face) or two entries from line.
-+ label nRead = 2;
-+ if (faceI == faceIndices.size()-1)
- {
-- FatalErrorIn("readPatches")
-- << "When reading patches expect Entity Type Code 8" << nl
-- << "At line " << is.lineNumber() << exit(FatalError);
-+ nRead = 1;
- }
-
-- faceIndices[faceI++] = tag1;
-- faceIndices[faceI++] = tag2;
-+ for (label i = 0; i < nRead; i++)
-+ {
-+ label typeCode, tag, nodeLeaf, component;
-+
-+ lineStr >> typeCode >> tag >> nodeLeaf >> component;
-+
-+ if (typeCode != 8)
-+ {
-+ FatalErrorIn("readPatches")
-+ << "When reading patches expect Entity Type Code 8"
-+ << nl << "At line " << is.lineNumber()
-+ << exit(FatalError);
-+ }
-+
-+ faceIndices[faceI++] = tag;
-+ }
- }
- }
-
- patchNames.shrink();
- patchFaceIndices.shrink();
- }
-
-@@ -688,15 +697,15 @@
- // sets (dofVertIndices).
-
- List<faceList> patchFaceVerts;
-
-
- if (dofVertIndices.size() > 0)
- {
-- // Use the vertex constraints to patch. Is of course bit dodge since
-+ // Use the vertex constraints to patch. Is of course bit dodgy since
- // face goes on patch if all its vertices are on a constraint.
- // Note: very inefficient since goes through all faces (including
- // internal ones) twice. Should do a construct without patches
- // and then repatchify.
-
- Info<< "Using " << dofVertIndices.size()
- << " DOF sets to detect boundary faces."<< endl;
-
+++ /dev/null
-diff -ur OpenFOAM-1.4.1-src/wmake/rules/General/flex++ OpenFOAM-1.4.1/wmake/rules/General/flex++
---- OpenFOAM-1.4.1-src/wmake/rules/General/flex++ 2006-08-18 17:35:12.000000000 +0200
-+++ OpenFOAM-1.4.1/wmake/rules/General/flex++ 2007-10-28 17:38:46.000000000 +0100
-@@ -1,6 +1,6 @@
- .SUFFIXES: .L
-
--Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
-+Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
-
- .L.dep:
- $(MAKE_DEP)
-diff -ur OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test OpenFOAM-1.4.1/wmake/rules/General/flex++.test
---- OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test 2007-03-13 17:27:58.000000000 +0100
-+++ OpenFOAM-1.4.1/wmake/rules/General/flex++.test 2007-10-28 17:39:09.000000000 +0100
-@@ -1,6 +1,6 @@
- .SUFFIXES: .L
-
--Ltoo = flex++ $$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)
+++ /dev/null
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-pkg-2 versionator multilib toolchain-funcs
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-3 ${PV})
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="OpenFOAM - Utilities"
-HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!=sci-libs/openfoam-${MY_PV}*
- !=sci-libs/openfoam-bin-${MY_PV}*
- =dev-java/sun-java3d-bin-1.4*
- <virtual/jdk-1.5
- =sci-libs/openfoam-kernel-${MY_PV}*
- sci-libs/parmetis"
-
-S=${WORKDIR}/${MY_P}
-INSDIR=/usr/$(get_libdir)/${MY_PN}/${MY_P}
-
-pkg_setup() {
- if ! version_is_at_least 4.1 $(gcc-version) ; then
- die "${PN} requires >=sys-devel/gcc-4.1 to compile."
- fi
-
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz
- unpack ./${MY_P}.General.tgz
-
- cd "${S}"
- epatch "${FILESDIR}"/${P}.patch
- epatch "${FILESDIR}"/${PN}-compile-${PV}.patch
-}
-
-src_compile() {
- cp -a "${INSDIR}"/.bashrc "${S}"/.bashrc || "cannot copy .bashrc"
- cp -a "${INSDIR}"/.${MY_P}/bashrc "${S}"/.${MY_P}/bashrc.bak || "cannot copy bashrc.bak"
-
- use amd64 && export WM_64="on"
-
- sed -i -e "s|/lib/j3d-org.jar|/lib/j3d-org.jar:/usr/share/sun-java3d-bin/lib/vecmath.jar:/usr/share/sun-java3d-bin/lib/j3dutils.jar:/usr/share/sun-java3d-bin/lib/j3dcore.jar|" \
- "${S}"/applications/utilities/mesh/manipulation/patchTool/Java/Allwmake
-
- sed -i -e "s|:../lib/j3d-org.jar|:../lib/j3d-org.jar:/usr/share/sun-java3d-bin/lib/vecmath.jar:/usr/share/sun-java3d-bin/lib/j3dutils.jar:/usr/share/sun-java3d-bin/lib/j3dcore.jar|" \
- "${S}"/applications/utilities/mesh/manipulation/patchTool/Java/Make/options
-
- sed -i -e "s|-lmetis \\\|-lmetis|" \
- -e 's|../metis-5.0pre2/include|/usr/include/metis|' \
- -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|' \
- "${S}"/applications/utilities/parallelProcessing/decompositionMethods/Allwmake \
- || die "could not replace metis options"
-
- 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|' \
- "${S}"/applications/utilities/parallelProcessing/decompositionMethods/parMetisDecomp/Make/options \
- || die "could not replace metis options"
-
- sed -i -e "s|WM_PROJECT_INST_DIR=/usr/$(get_libdir)/\$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"
-
- sed -i -e "s|\$WM_PROJECT_INST_DIR/\$WM_ARCH/bin|"${INSDIR}"/bin|" \
- -e "s|FOAM_LIB=\$WM_PROJECT_DIR/lib|FOAM_LIB="${INSDIR}"/lib|" \
- -e "s|FOAM_LIBBIN=\$FOAM_LIB|FOAM_LIBBIN=\$WM_PROJECT_DIR/lib/\$WM_OPTIONS|" \
- -e "s|AddLib \$FOAM_USER_LIBBIN|AddLib \$FOAM_LIB|" \
- -e "s|applications/bin|applications/bin/\$WM_OPTIONS|" \
- -e "s|FOAM_MPI_LIBBIN=\$FOAM_LIBBIN/|FOAM_MPI_LIBBIN="${INSDIR}"/lib/|" \
- "${S}"/.bashrc || die "could not replace paths"
-
- sed -i -e "s|-L\$(LIB_WM_OPTIONS_DIR)|-L\$(LIB_WM_OPTIONS_DIR) -L${INSDIR}/lib|" \
- "${S}"/wmake/Makefile || die "could not replace search paths"
-
- source "${S}"/.${MY_P}/bashrc.bak
-
- cd "${S}"/applications/utilities
- wmake all || die "could not build OpenFOAM utilities"
- 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
-}
-
-src_install() {
- insopts -m0755
- 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}/*
-
- find "${S}"/applications -type d \( -name "${WM_OPTIONS}" -o -name linuxDebug -o -name linuxOpt \) | xargs rm -rf
-
- insopts -m0644
- insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications
- doins -r applications/test applications/utilities
-}
projects / ~andy / sunrise / commitdiff