# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 30 Mar 2008; Thomas Sachau (Tommy[D]) tommy@gentoo.org
+ -openfoam-utilities-1.4.1_p20080118.ebuild,
+ -files/openfoam-utilities-compile-1.4.1_p20080118.patch,
+ -files/openfoam-utilities-1.4.1_p20080118.patch:
+ Drop old version
+
28 Mar 2008; Oliver Borm (boroli) <oli.borm@web.de>
+openfoam-utilities-1.4.1_p20080328.ebuild,
+files/openfoam-utilities-1.4.1_p20080328.patch,
-AUX openfoam-utilities-1.4.1_p20080118.patch 4177 RMD160 a6d71f4afb06e962eae8ebfca6dbb5958ea9b0a5 SHA1 c8650af7eb8c72e9bfd4b2d9882829fc0f0a798f SHA256 bd3a4f475487a1a32efbc111e62666dabad57ea35bcc9806a4fe0fc8ebc54906
-AUX openfoam-utilities-1.4.1_p20080328.patch 6357 RMD160 4022b04557ba6d7da87a7c44e26f300a77a922b2 SHA1 98c40c041ce5c04c1f3df1a5f07f85d91cb69ef4 SHA256 a4187c759e84a166b9fccbda4dcdad6f25c7b29da01a34209b4771394a4be11f
-AUX openfoam-utilities-compile-1.4.1_p20080118.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
-AUX openfoam-utilities-compile-1.4.1_p20080328.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
+AUX openfoam-utilities-1.4.1_p20080328.patch 6357 SHA1 98c40c041ce5c04c1f3df1a5f07f85d91cb69ef4
+AUX openfoam-utilities-compile-1.4.1_p20080328.patch 996 SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e
DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
-EBUILD openfoam-utilities-1.4.1_p20080118.ebuild 4483 RMD160 9d44c91ee8ec2eb78409a003031999db3a2a0b88 SHA1 e1c71e22201a127a80f356787d5ba73ddf4373dd SHA256 8d7ad76477c6a9af2498d5350bff0855ba9760216ebde831d5e2ee6ec8e40c70
-EBUILD openfoam-utilities-1.4.1_p20080328.ebuild 4397 RMD160 fdc3c23f310ab896cfd12df30c3d033f328015e8 SHA1 4681e6604c8e09a5edf1e0b7e62fcc60c71ffb95 SHA256 f22b7b946cec195c7a99f4551f63223abd9631dbb0c156b23acea7426fec5a3b
-MISC ChangeLog 662 RMD160 7510afda9d5b94d766b45c9c0e888369910b5d04 SHA1 e881f0c260b4936333c5990da298c4a46dd4d365 SHA256 6c6b1931a8d145b8a9589d26f02517b9d46deb3536ad686263d607b26eb6ca52
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+EBUILD openfoam-utilities-1.4.1_p20080328.ebuild 4397 SHA1 4681e6604c8e09a5edf1e0b7e62fcc60c71ffb95
+MISC ChangeLog 895 SHA1 38866b99ee66fbfc9fbdbd2a5cbc20c5d37cf97c
+MISC metadata.xml 170 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4
+++ /dev/null
-Index: applications/utilities/mesh/manipulation/Optional/Allwmake
-===================================================================
---- applications/utilities/mesh/manipulation/Optional/Allwmake (Revision 30)
-+++ applications/utilities/mesh/manipulation/Optional/Allwmake (Revision 408)
-@@ -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: applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
-===================================================================
---- applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C (Revision 30)
-+++ applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C (Revision 408)
-@@ -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="metis"
-
-RDEPEND="!sci-libs/openfoam
- !sci-libs/openfoam-bin
- <virtual/jdk-1.5
- >=sci-libs/openfoam-kernel-${MY_PV}"
-DEPEND="${RDEPEND}"
-
-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
-
- if use metis ; then
- 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|' \
- "${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|' \
- -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
-
- 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