From 18856c80b8ee0a0493503bd5d9bfc4a63ae87a4f Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Tue, 8 Mar 2016 15:34:34 +0100
Subject: sci-libs/openfoam: Fix slotting #575238

Package-Manager: portage-2.2.27
RepoMan-Options: --force
---
 sci-libs/openfoam/openfoam-2.3.0-r1.ebuild | 113 ++++++++++++++++++++++++++++
 sci-libs/openfoam/openfoam-2.3.0.ebuild    | 113 ----------------------------
 sci-libs/openfoam/openfoam-2.3.1-r1.ebuild | 113 ++++++++++++++++++++++++++++
 sci-libs/openfoam/openfoam-2.3.1.ebuild    | 113 ----------------------------
 sci-libs/openfoam/openfoam-2.4.0-r1.ebuild | 114 +++++++++++++++++++++++++++++
 sci-libs/openfoam/openfoam-2.4.0.ebuild    | 114 -----------------------------
 6 files changed, 340 insertions(+), 340 deletions(-)
 create mode 100644 sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
 delete mode 100644 sci-libs/openfoam/openfoam-2.3.0.ebuild
 create mode 100644 sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
 delete mode 100644 sci-libs/openfoam/openfoam-2.3.1.ebuild
 create mode 100644 sci-libs/openfoam/openfoam-2.4.0-r1.ebuild
 delete mode 100644 sci-libs/openfoam/openfoam-2.4.0.ebuild

(limited to 'sci-libs/openfoam')

diff --git a/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild b/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
new file mode 100644
index 00000000000..71cc63b372b
--- /dev/null
+++ b/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator multilib toolchain-funcs multiprocessing
+
+MY_PN="OpenFOAM"
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
+HOMEPAGE="http://www.openfoam.org"
+SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples opendx src paraview"
+
+RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
+	!=sci-libs/openfoam-kernel-${MY_PV}*
+	!=sci-libs/openfoam-meta-${MY_PV}*
+	!=sci-libs/openfoam-solvers-${MY_PV}*
+	!=sci-libs/openfoam-utilities-${MY_PV}*
+	!=sci-libs/openfoam-wmake-${MY_PV}*
+	sci-libs/parmetis
+	sci-libs/parmgridgen
+	sci-libs/scotch
+	virtual/mpi
+	opendx? ( sci-visualization/opendx )
+	paraview? ( ~sci-visualization/paraview-4.1.0[development] )"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+S=${WORKDIR}/${MY_P}
+INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
+
+pkg_setup() {
+	# just to be sure the right profile is selected (gcc-config)
+	if ! version_is_at_least 4.3 $(gcc-version) ; then
+		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
+	fi
+
+	elog
+	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
+	elog
+	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
+	elog
+	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
+	ewarn
+	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
+	ewarn
+}
+
+src_configure() {
+	if has_version sys-cluster/mpich2 ; then
+		export WM_MPLIB=MPICH
+	elif has_version sys-cluster/openmpi ; then
+		export WM_MPLIB=OPENMPI
+	else
+		die "You need one of the following mpi implementations: openmpi 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
+
+	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
+	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
+
+	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
+	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
+}
+
+src_compile() {
+	export WM_NCOMPPROCS=$(makeopts_jobs)
+
+	export FOAM_INST_DIR=${WORKDIR}
+	source etc/bashrc
+
+	find wmake -name dirToString -exec rm -rf {} +
+	find wmake -name wmkdep -exec rm -rf {}+
+
+	./Allwmake || die "could not build"
+	if use doc ; then
+		doc/Allwmake || die "could not build"
+	fi
+}
+
+# Doesn't do anything sane
+#src_test() {
+#	cd bin
+#	./foamInstallationTest
+#}
+
+src_install() {
+	insinto ${INSDIR}
+	doins -r etc
+
+	use examples && doins -r tutorials
+
+	use src && doins -r src
+
+	insopts -m0755
+	doins -r bin applications platforms wmake
+
+	dodoc README.html doc/Guides-a4/*.pdf
+
+	if use doc ; then
+		dohtml -r doc/Doxygen
+	fi
+}
diff --git a/sci-libs/openfoam/openfoam-2.3.0.ebuild b/sci-libs/openfoam/openfoam-2.3.0.ebuild
deleted file mode 100644
index d67d5effe58..00000000000
--- a/sci-libs/openfoam/openfoam-2.3.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src paraview"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )
-	paraview? ( ~sci-visualization/paraview-4.1.0[development] )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi 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
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-
-	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
-	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	./Allwmake || die "could not build"
-	if use doc ; then
-		doc/Allwmake || die "could not build"
-	fi
-}
-
-# Doesn't do anything sane
-#src_test() {
-#	cd bin
-#	./foamInstallationTest
-#}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild b/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
new file mode 100644
index 00000000000..edab3494074
--- /dev/null
+++ b/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator multilib toolchain-funcs multiprocessing
+
+MY_PN="OpenFOAM"
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
+HOMEPAGE="http://www.openfoam.org"
+SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2.3"
+KEYWORDS="amd64 x86"
+IUSE="doc examples opendx src paraview"
+
+RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
+	!=sci-libs/openfoam-kernel-${MY_PV}*
+	!=sci-libs/openfoam-meta-${MY_PV}*
+	!=sci-libs/openfoam-solvers-${MY_PV}*
+	!=sci-libs/openfoam-utilities-${MY_PV}*
+	!=sci-libs/openfoam-wmake-${MY_PV}*
+	sci-libs/parmetis
+	sci-libs/parmgridgen
+	sci-libs/scotch
+	virtual/mpi
+	opendx? ( sci-visualization/opendx )
+	paraview? ( ~sci-visualization/paraview-4.1.0[development] )"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+S=${WORKDIR}/${MY_P}
+INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
+
+pkg_setup() {
+	# just to be sure the right profile is selected (gcc-config)
+	if ! version_is_at_least 4.3 $(gcc-version) ; then
+		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
+	fi
+
+	elog
+	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
+	elog
+	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
+	elog
+	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
+	ewarn
+	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
+	ewarn
+}
+
+src_configure() {
+	if has_version sys-cluster/mpich2 ; then
+		export WM_MPLIB=MPICH
+	elif has_version sys-cluster/openmpi ; then
+		export WM_MPLIB=OPENMPI
+	else
+		die "You need one of the following mpi implementations: openmpi 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
+
+	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
+	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
+
+	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
+	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
+}
+
+src_compile() {
+	export WM_NCOMPPROCS=$(makeopts_jobs)
+
+	export FOAM_INST_DIR=${WORKDIR}
+	source etc/bashrc
+
+	find wmake -name dirToString -exec rm -rf {} +
+	find wmake -name wmkdep -exec rm -rf {}+
+
+	./Allwmake || die "could not build"
+	if use doc ; then
+		doc/Allwmake || die "could not build"
+	fi
+}
+
+# Doesn't do anything sane
+#src_test() {
+#	cd bin
+#	./foamInstallationTest
+#}
+
+src_install() {
+	insinto ${INSDIR}
+	doins -r etc
+
+	use examples && doins -r tutorials
+
+	use src && doins -r src
+
+	insopts -m0755
+	doins -r bin applications platforms wmake
+
+	dodoc README.html doc/Guides-a4/*.pdf
+
+	if use doc ; then
+		dohtml -r doc/Doxygen
+	fi
+}
diff --git a/sci-libs/openfoam/openfoam-2.3.1.ebuild b/sci-libs/openfoam/openfoam-2.3.1.ebuild
deleted file mode 100644
index 988db480333..00000000000
--- a/sci-libs/openfoam/openfoam-2.3.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-IUSE="doc examples opendx src paraview"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )
-	paraview? ( ~sci-visualization/paraview-4.1.0[development] )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi 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
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-
-	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
-	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	./Allwmake || die "could not build"
-	if use doc ; then
-		doc/Allwmake || die "could not build"
-	fi
-}
-
-# Doesn't do anything sane
-#src_test() {
-#	cd bin
-#	./foamInstallationTest
-#}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
diff --git a/sci-libs/openfoam/openfoam-2.4.0-r1.ebuild b/sci-libs/openfoam/openfoam-2.4.0-r1.ebuild
new file mode 100644
index 00000000000..74e03341b7b
--- /dev/null
+++ b/sci-libs/openfoam/openfoam-2.4.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator multilib toolchain-funcs multiprocessing
+
+MY_PN="OpenFOAM"
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
+HOMEPAGE="http://www.openfoam.org"
+SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples opendx src paraview"
+
+RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
+	!=sci-libs/openfoam-kernel-${MY_PV}*
+	!=sci-libs/openfoam-meta-${MY_PV}*
+	!=sci-libs/openfoam-solvers-${MY_PV}*
+	!=sci-libs/openfoam-utilities-${MY_PV}*
+	!=sci-libs/openfoam-wmake-${MY_PV}*
+	sci-mathematics/cgal
+	sci-libs/parmetis
+	sci-libs/parmgridgen
+	sci-libs/scotch
+	virtual/mpi
+	opendx? ( sci-visualization/opendx )
+	paraview? ( sci-visualization/paraview[development] )"
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+S=${WORKDIR}/${MY_P}
+INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
+
+pkg_setup() {
+	# just to be sure the right profile is selected (gcc-config)
+	if ! version_is_at_least 4.3 $(gcc-version) ; then
+		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
+	fi
+
+	elog
+	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
+	elog
+	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
+	elog
+	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
+	ewarn
+	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
+	ewarn
+}
+
+src_configure() {
+	if has_version sys-cluster/mpich2 ; then
+		export WM_MPLIB=MPICH
+	elif has_version sys-cluster/openmpi ; then
+		export WM_MPLIB=OPENMPI
+	else
+		die "You need one of the following mpi implementations: openmpi 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
+
+	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
+	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
+
+	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
+	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
+}
+
+src_compile() {
+	export WM_NCOMPPROCS=$(makeopts_jobs)
+
+	export FOAM_INST_DIR=${WORKDIR}
+	source etc/bashrc
+
+	find wmake -name dirToString -exec rm -rf {} +
+	find wmake -name wmkdep -exec rm -rf {}+
+
+	./Allwmake || die "could not build"
+	if use doc ; then
+		doc/Allwmake || die "could not build"
+	fi
+}
+
+# Doesn't do anything sane
+#src_test() {
+#	cd bin
+#	./foamInstallationTest
+#}
+
+src_install() {
+	insinto ${INSDIR}
+	doins -r etc
+
+	use examples && doins -r tutorials
+
+	use src && doins -r src
+
+	insopts -m0755
+	doins -r bin applications platforms wmake
+
+	dodoc README.html doc/Guides-a4/*.pdf
+
+	if use doc ; then
+		dohtml -r doc/Doxygen
+	fi
+}
diff --git a/sci-libs/openfoam/openfoam-2.4.0.ebuild b/sci-libs/openfoam/openfoam-2.4.0.ebuild
deleted file mode 100644
index d26b9c736c4..00000000000
--- a/sci-libs/openfoam/openfoam-2.4.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator multilib toolchain-funcs multiprocessing
-
-MY_PN="OpenFOAM"
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Open Field Operation and Manipulation - CFD Simulation Toolbox"
-HOMEPAGE="http://www.openfoam.org"
-SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src paraview"
-
-RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
-	!=sci-libs/openfoam-kernel-${MY_PV}*
-	!=sci-libs/openfoam-meta-${MY_PV}*
-	!=sci-libs/openfoam-solvers-${MY_PV}*
-	!=sci-libs/openfoam-utilities-${MY_PV}*
-	!=sci-libs/openfoam-wmake-${MY_PV}*
-	sci-mathematics/cgal
-	sci-libs/parmetis
-	sci-libs/parmgridgen
-	sci-libs/scotch
-	virtual/mpi
-	opendx? ( sci-visualization/opendx )
-	paraview? ( sci-visualization/paraview[development] )"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
-
-S=${WORKDIR}/${MY_P}
-INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
-
-pkg_setup() {
-	# just to be sure the right profile is selected (gcc-config)
-	if ! version_is_at_least 4.3 $(gcc-version) ; then
-		die "${PN} requires >=sys-devel/gcc-4.3 to compile."
-	fi
-
-	elog
-	elog "In order to use ${MY_PN} you should add the following line to ~/.bashrc :"
-	elog
-	elog "alias startOF$(delete_all_version_separators ${MY_PV})='source ${INSDIR}/etc/bashrc'"
-	elog
-	elog "And everytime you want to use OpenFOAM you have to execute startOF$(delete_all_version_separators ${MY_PV})"
-	ewarn
-	ewarn "FoamX is deprecated since ${MY_PN}-1.5! "
-	ewarn
-}
-
-src_configure() {
-	if has_version sys-cluster/mpich2 ; then
-		export WM_MPLIB=MPICH
-	elif has_version sys-cluster/openmpi ; then
-		export WM_MPLIB=OPENMPI
-	else
-		die "You need one of the following mpi implementations: openmpi 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
-
-	sed -i -e "s|^foamInstall=\$HOME|foamInstall=/usr/$(get_libdir)|" etc/bashrc
-	sed -i -e "s|^set foamInstall = \$HOME|set foamInstall = /usr/$(get_libdir)|" etc/cshrc
-
-	sed -i -e 's|^export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|export ParaView_DIR=/usr|' etc/config/paraview.sh
-	sed -i -e 's|^setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName|setenv ParaView_DIR /usr|' etc/config/paraview.csh
-}
-
-src_compile() {
-	export WM_NCOMPPROCS=$(makeopts_jobs)
-
-	export FOAM_INST_DIR=${WORKDIR}
-	source etc/bashrc
-
-	find wmake -name dirToString -exec rm -rf {} +
-	find wmake -name wmkdep -exec rm -rf {}+
-
-	./Allwmake || die "could not build"
-	if use doc ; then
-		doc/Allwmake || die "could not build"
-	fi
-}
-
-# Doesn't do anything sane
-#src_test() {
-#	cd bin
-#	./foamInstallationTest
-#}
-
-src_install() {
-	insinto ${INSDIR}
-	doins -r etc
-
-	use examples && doins -r tutorials
-
-	use src && doins -r src
-
-	insopts -m0755
-	doins -r bin applications platforms wmake
-
-	dodoc README.html doc/Guides-a4/*.pdf
-
-	if use doc ; then
-		dohtml -r doc/Doxygen
-	fi
-}
-- 
cgit v1.2.1