sci-libs/openfoam-wmake: Remove old version.

svn path=/sunrise/; revision=7920

5 files changed, 7 insertions, 249 deletions

diff --git a/sci-libs/openfoam-wmake/ChangeLog b/sci-libs/openfoam-wmake/ChangeLog
index a42a84116..86cb11df9 100644
--- a/sci-libs/openfoam-wmake/ChangeLog
+++ b/sci-libs/openfoam-wmake/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Feb 2009; Oliver Borm (boroli) <oli.borm@web.de>
+  -openfoam-wmake-1.4.1_p20080827.ebuild,
+  -files/openfoam-wmake-paraFoam-1.4.1_p20080827.patch,
+  -files/openfoam-wmake-compile-1.4.1_p20080827.patch:
+  Remove old version.
+
   05 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
   openfoam-wmake-1.4.1_p20080827.ebuild,
   openfoam-wmake-1.5_p20080905.ebuild:
diff --git a/sci-libs/openfoam-wmake/Manifest b/sci-libs/openfoam-wmake/Manifest
index da102ec6c..2c5edebf6 100644
--- a/sci-libs/openfoam-wmake/Manifest
+++ b/sci-libs/openfoam-wmake/Manifest
@@ -1,11 +1,6 @@
 AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89
-AUX openfoam-wmake-compile-1.4.1_p20080827.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
-AUX openfoam-wmake-paraFoam-1.4.1_p20080827.patch 1065 RMD160 b20c53b7976fd9c25303dc3d2a31f8f02cfd7468 SHA1 52233c957fed91051f7e0fa99647ae616a366833 SHA256 0afa1abae77b52da3343983b892f7b975117b5758e0582b726b58adc41561d70
-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
-DIST openfoam-wmake-1.4.1_p20080827.patch 578413 RMD160 e5e4b0a7be1ffeeee67d59a81c705527a3dfeb7e SHA1 7999f7171f8dd1711ae9025e3a2439a1334572ca SHA256 5bae4193a320ed363f83886a89f548bd6ba78f6f2da74d78133435cfd9f52b1b
 DIST openfoam-wmake-1.5_p20080905.patch 2698588 RMD160 479bd1c9982898f494ad479198852027e787a252 SHA1 0f9f5c27afc9e483d1cf0c1bb20a700def8b2a52 SHA256 76a2a6830dea1a5c0085d5f9bafb33059d5141693b5b4d1622654554cf67917a
-EBUILD openfoam-wmake-1.4.1_p20080827.ebuild 7755 RMD160 dd3b6d9ef49e29d1de1ac5135b8ca72548f9dd54 SHA1 9d941bec70f82fcb305d56397f7be7e21b1d8c50 SHA256 a6cc34b64e03886c7d02ba2cc08e34c3cdec3ff8c926be23f31e7ca6cf1d7c48
 EBUILD openfoam-wmake-1.5_p20080905.ebuild 2653 RMD160 fca53794bc19299996d597ba4be7b024170b0aac SHA1 8f55148b898356f4d60305be23df6c9e5fe0887d SHA256 67e53a7286cc6c83868ec368d5c86d846a531985d9820d3ec1f989f96a0e4fe7
-MISC ChangeLog 3124 RMD160 31ecbdc7a830b95d5b9d91f79b0a8f587a956d1a SHA1 54bac51957216ed70c601262913e200d27c0f336 SHA256 a88d0351daa4324e945ab6d4b38e3363bf6715d95771220f3b7abdcbc845122b
+MISC ChangeLog 3354 RMD160 dd993340d36b439e4a818bd76983a05cdc89955f SHA1 e58570ded48b6108dfc74bfd8934071c11ae30fc SHA256 d4a2ade6bb54acd6d0c80d4c25c604ee4c50cd0c3ea05d57b6cd186d653b6d81
 MISC metadata.xml 338 RMD160 5c81790bd48a9e38ad9bc98fc5e15fa1ff6dac5c SHA1 bae9c545be8e4438b9e1f891ffc33a53405e753d SHA256 8daa7d1d48a127020f8cb03c55bb6140a1253d374284318384def84d7d725b5e
diff --git a/sci-libs/openfoam-wmake/files/openfoam-wmake-compile-1.4.1_p20080827.patch b/sci-libs/openfoam-wmake/files/openfoam-wmake-compile-1.4.1_p20080827.patch
deleted file mode 100644
index e2ab13d8e..000000000
--- a/sci-libs/openfoam-wmake/files/openfoam-wmake-compile-1.4.1_p20080827.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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)
diff --git a/sci-libs/openfoam-wmake/files/openfoam-wmake-paraFoam-1.4.1_p20080827.patch b/sci-libs/openfoam-wmake/files/openfoam-wmake-paraFoam-1.4.1_p20080827.patch
deleted file mode 100644
index 56adcecfb..000000000
--- a/sci-libs/openfoam-wmake/files/openfoam-wmake-paraFoam-1.4.1_p20080827.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- OpenFOAM-1.4.1-src/bin/paraFoam	2007-04-17 12:57:20.000000000 +0200
-+++ paraFoam	2008-03-28 12:36:24.000000000 +0100
-@@ -66,13 +66,19 @@
-     [ -s "$rootDir/$check" ] || usage "file does not exist:  '$check'"
- done
- 
-+if [ -r system/controlDict.foam ]; then
-+	echo "$0: Using already present $caseDir/system/controlDict.foam"
-+	# since we are now in the cwd, ROOT/CASE is '$PWD'
-+	paraview --data="$PWD/system/controlDict.foam"
-+else
-+	if [ ! -s system/controlDict ]; then
-+	    usage "file does not exist:  'system/controlDict'"
-+	fi
-+	ln system/controlDict system/controlDict.foam
-+	# since we are now in the cwd, ROOT/CASE is '$PWD'
-+	paraview --data="$PWD/system/controlDict.foam"
-+fi
- 
--# since we are now in the cwd, ROOT/CASE is '$PWD'
--sed -e s%ROOT/CASE%$PWD%g \
--    -e s%CASE%$caseName%g $WM_PROJECT_DIR/bin/paraFoam.pvs > paraFoam.pvs
--
--touch $caseName.foam
--paraview paraFoam.pvs
--rm paraFoam.pvs $caseName.foam 2>/dev/null
-+rm system/controlDict.foam 2>/dev/null
- 
- #------------------------------------------------------------------------------
diff --git a/sci-libs/openfoam-wmake/openfoam-wmake-1.4.1_p20080827.ebuild b/sci-libs/openfoam-wmake/openfoam-wmake-1.4.1_p20080827.ebuild
deleted file mode 100644
index 89e5a606b..000000000
--- a/sci-libs/openfoam-wmake/openfoam-wmake-1.4.1_p20080827.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2009 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 - wmake"
-HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz
-	http://dev.gentooexperimental.org/~tommy/distfiles/${P}.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples lam mpich"
-
-DEPEND="!=sci-libs/openfoam-${MY_PV}*
-	!=sci-libs/openfoam-bin-${MY_PV}*
-	net-misc/mico
-	<virtual/jdk-1.5
-	|| ( >sci-visualization/paraview-3.0 sci-visualization/opendx )
-	!mpich? ( !lam? ( sys-cluster/openmpi ) )
-	lam? ( sys-cluster/lam-mpi )
-	mpich? ( sys-cluster/mpich2 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${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
-
-	if use amd64 ; then
-		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
-		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
-}
-
-src_unpack() {
-	ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz
-	unpack ./${MY_P}.General.tgz
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${PN}-compile-${PV}.patch
-	epatch "${FILESDIR}"/${PN}-paraFoam-${PV}.patch
-}
-
-src_compile() {
-	use amd64 && export WM_64="on"
-
-	if use lam ; then
-		export WM_MPLIB=LAM
-	elif use mpich ; then
-		export WM_MPLIB=MPICH
-	else
-		export WM_MPLIB=OPENMPI
-	fi
-
-	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|[^#]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|"	\
-			"${S}"/.${MY_P}/bashrc
-
-	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|[^#]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|"	\
-			"${S}"/.${MY_P}/cshrc
-
-	sed -i -e "s|FOAM_JOB_DIR=\$WM_PROJECT_INST_DIR/jobControl|FOAM_JOB_DIR=\$HOME/\$WM_PROJECT/jobControl|"	\
-		-e "s|WM_COMPILER_DIR=|WM_COMPILER_DIR=/usr # |"	\
-		-e 's|JAVA_HOME=|JAVA_HOME=${JAVA_HOME} # |'	\
-		-e 's@OPENMPI_VERSION=@OPENMPI_VERSION=`/usr/bin/ompi_info --version ompi full --parsable | grep ompi:version:full | cut -d: -f4-` # @'	\
-		-e 's|[^#]export OPENMPI_HOME=|# export OPENMPI_HOME=|'	\
-		-e 's|OPENMPI_ARCH_PATH=|OPENMPI_ARCH_PATH=/usr # |'	\
-		-e 's@LAM_VERSION=@LAM_VERSION=`/usr/bin/laminfo -version lam full | awk ''{print \$\$2}''` # @'	\
-		-e 's|[^#]export LAMHOME=|# export LAMHOME=|'	\
-		-e 's|LAM_ARCH_PATH=|LAM_ARCH_PATH=/usr # |'	\
-		-e 's|MPICH_VERSION=|MPICH_VERSION=`/usr/bin/mpich2version --version` # |'	\
-		-e 's|[^#]export MPICH_PATH=$FOAM_SRC|# export MPICH_PATH=$FOAM_SRC|'	\
-		-e 's|MPICH_ARCH_PATH=|MPICH_ARCH_PATH=/usr # |'	\
-		-e 's|AddLib $OPENMPI_ARCH_PATH|# AddLib $OPENMPI_ARCH_PATH|'	\
-		-e 's|AddPath $OPENMPI_ARCH_PATH|# AddPath $OPENMPI_ARCH_PATH|'	\
-		-e 's|AddLib $LAM_ARCH_PATH|# AddLib $LAM_ARCH_PATH|'	\
-		-e 's|AddPath $LAM_ARCH_PATH|# AddPath $LAM_ARCH_PATH|'	\
-		-e 's|AddLib $MPICH_ARCH_PATH|# AddLib $MPICH_ARCH_PATH|'	\
-		-e 's|AddPath $MPICH_ARCH_PATH|# AddPath $MPICH_ARCH_PATH|'	\
-		-e 's|$FOAM_LIBBIN/openmpi-$OPENMPI_VERSION|$FOAM_LIBBIN/openmpi|'	\
-		-e 's|$FOAM_LIBBIN/lam-$LAM_VERSION|$FOAM_LIBBIN/lam|'	\
-		-e 's|$FOAM_LIBBIN/mpich-$MPICH_VERSION|$FOAM_LIBBIN/mpich|'	\
-		-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|FOAM_JOB_DIR \$WM_PROJECT_INST_DIR/jobControl|FOAM_JOB_DIR \$HOME/\$WM_PROJECT/jobControl|"	\
-		-e "s|WM_COMPILER_DIR |WM_COMPILER_DIR /usr # |"	\
-		-e 's|JAVA_HOME |JAVA_HOME ${JAVA_HOME} # |'	\
-		-e 's@OPENMPI_VERSION @OPENMPI_VERSION `/usr/bin/ompi_info --version ompi full --parsable | grep ompi:version:full | cut -d: -f4-` # @'	\
-		-e 's|[^#]setenv OPENMPI_HOME|# setenv OPENMPI_HOME|'	\
-		-e 's|OPENMPI_ARCH_PATH |OPENMPI_ARCH_PATH /usr # |'	\
-		-e 's@LAM_VERSION @LAM_VERSION `/usr/bin/laminfo -version lam full | awk ''{print \$\$2}''` # @'	\
-		-e 's|[^#]setenv LAMHOME|# setenv LAMHOME|'	\
-		-e 's|LAM_ARCH_PATH |LAM_ARCH_PATH /usr # |'	\
-		-e 's|MPICH_VERSION |MPICH_VERSION `/usr/bin/mpich2version --version` # |'	\
-		-e 's|[^#]setenv MPICH_PATH $FOAM_SRC|# setenv MPICH_PATH $FOAM_SRC|'	\
-		-e 's|MPICH_ARCH_PATH |MPICH_ARCH_PATH /usr # |'	\
-		-e 's|AddLib $OPENMPI_ARCH_PATH|# AddLib $OPENMPI_ARCH_PATH|'	\
-		-e 's|AddPath $OPENMPI_ARCH_PATH|# AddPath $OPENMPI_ARCH_PATH|'	\
-		-e 's|AddLib $LAM_ARCH_PATH|# AddLib $LAM_ARCH_PATH|'	\
-		-e 's|AddPath $LAM_ARCH_PATH|# AddPath $LAM_ARCH_PATH|'	\
-		-e 's|AddLib $MPICH_ARCH_PATH|# AddLib $MPICH_ARCH_PATH|'	\
-		-e 's|AddPath $MPICH_ARCH_PATH|# AddPath $MPICH_ARCH_PATH|'	\
-		-e 's|$FOAM_LIBBIN/openmpi-$OPENMPI_VERSION|$FOAM_LIBBIN/openmpi|'	\
-		-e 's|$FOAM_LIBBIN/lam-$LAM_VERSION|$FOAM_LIBBIN/lam|'	\
-		-e 's|$FOAM_LIBBIN/mpich-$MPICH_VERSION|$FOAM_LIBBIN/mpich|'	\
-		-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
-
-	cp "${S}"/.${MY_P}/bashrc "${S}"/.${MY_P}/bashrc.bak || "cannot copy bashrc"
-
-	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"
-
-	source "${S}"/.${MY_P}/bashrc.bak
-
-	find "${S}"/wmake -name dirToString | xargs rm -rf
-	find "${S}"/wmake -name wmkdep | xargs rm -rf
-
-	cd "${S}"/wmake
-	./makeWmake || die "could not build wmake"
-
-	rm "${S}"/bin/paraFoam.pvs
-	rm "${S}"/.${MY_P}/bashrc.bak
-
-	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"
-}
-
-src_test() {
-	cd "${S}"/bin
-	./foamInstallationTest
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/"${MY_PN}"/${MY_P}
-	doins -r .bashrc .cshrc .${MY_P}
-
-	use examples && doins -r tutorials
-
-	insopts -m0755
-	doins -r bin
-
-	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/wmake
-	doins -r wmake/*
-
-	insopts -m0644
-	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
-}