Fix for #402895

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 128 insertions, 11 deletions

diff --git a/sci-libs/openfoam/ChangeLog b/sci-libs/openfoam/ChangeLog
index c7d2b368905a..2f3d810850e8 100644
--- a/sci-libs/openfoam/ChangeLog
+++ b/sci-libs/openfoam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/openfoam
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/ChangeLog,v 1.10 2012/06/19 02:21:17 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/ChangeLog,v 1.11 2013/02/01 08:10:20 patrick Exp $
+
+*openfoam-2.1.1-r1 (01 Feb 2013)
+
+  01 Feb 2013; Patrick Lauer <patrick@gentoo.org> +openfoam-2.1.1-r1.ebuild:
+  Fix for #402895
 
 *openfoam-2.1.1 (19 Jun 2012)
 
@@ -143,4 +148,3 @@
   +files/compile-1.4.1.patch, +metadata.xml,
   +openfoam-1.4.1_p20071028.ebuild:
   New ebuild for bug 104257
-
diff --git a/sci-libs/openfoam/Manifest b/sci-libs/openfoam/Manifest
index a7c2e8486eed..e7a9b0a9e396 100644
--- a/sci-libs/openfoam/Manifest
+++ b/sci-libs/openfoam/Manifest
@@ -1,8 +1,9 @@
-DIST OpenFOAM-1.7.1.tgz 39002749 RMD160 867b48f67f60c63d8e0311afb5e903c79933d4c1 SHA1 7e6f69f82baf1a3bb650bc1bc4d31857312ab020 SHA256 878f3cd99a888573013eadc5d7f864fdf8e20b4749fc19cb36db450a719314e8
-DIST OpenFOAM-2.1.0.tgz 32518358 RMD160 3c6c0cc7d3ee0fb913d4bf512ec7d5d55e059003 SHA1 a8508b87d2bd5d6985cf67851ec8eb46ae52dc6b SHA256 d8467b38c06b6f030b78c44cb3a1dec819432f6ccd49c28928d977f12171ec77
-DIST OpenFOAM-2.1.1.tgz 30709473 RMD160 73599db77c2a76b173c128c3027cc70058a1e109 SHA1 b795abed7ddbc7428c9ce0190c3018041054efea SHA256 b085980c507de4e00339335c3de2d0bdae1b31372320d62baae7ff8a98da64bc
-EBUILD openfoam-1.7.1.ebuild 2750 RMD160 2ec3afcd56ef7b056ef9bb997f9978920f547cd7 SHA1 429e28246c9ab44eae1b4991a54e2008a9f21a27 SHA256 523be0e9ecc62a5b5b54ed3e82521ddd918e48c2cced01f53b77589cae4f4db0
-EBUILD openfoam-2.1.0.ebuild 2844 RMD160 88e27e1bdc9f94a76aeeb65b9adb801c1485267d SHA1 6138b4a071aaa9237ad81ea517a80a28a42b9b96 SHA256 f4e0241efd74524d6a361393ad3c64e0aef0806d579f1f6c34652ad8a23b03ea
-EBUILD openfoam-2.1.1.ebuild 2844 RMD160 2585380ca563d594814d02b2001c9550de72f09f SHA1 134855996091e0694b43e5a682733dd22a392852 SHA256 414cb367e692f544301b198afdf9026147af5cb962951481cf188d48fb447dc4
-MISC ChangeLog 5589 RMD160 b4565dc57108000c7d550cb44b8d795804ecf7d5 SHA1 5d853ec6edb9c463684e2c71874e59543cb51fb1 SHA256 3b97b9ab378db5d8eea4a15ed1344418b89d96475049ba91adef2eea236b3b9d
-MISC metadata.xml 322 RMD160 e126ff7541d9229ac010158a68ce5990d6915679 SHA1 424a6f6de3d3e37f78c1790410753f68cf82a642 SHA256 0ad90544bb071480e4f598561808d748784ed1d205167d36b2d757fd263431ee
+DIST OpenFOAM-1.7.1.tgz 39002749 SHA256 878f3cd99a888573013eadc5d7f864fdf8e20b4749fc19cb36db450a719314e8
+DIST OpenFOAM-2.1.0.tgz 32518358 SHA256 d8467b38c06b6f030b78c44cb3a1dec819432f6ccd49c28928d977f12171ec77
+DIST OpenFOAM-2.1.1.tgz 30709473 SHA256 b085980c507de4e00339335c3de2d0bdae1b31372320d62baae7ff8a98da64bc SHA512 91a76d3cc84fff0c03b137a9429807a525b871d90177e4e396014a8434dfeeea7b00350a05fdd7d19bfbcc0b8f2dbe73a541c92bc58cf6cef410dcb7f64995ad WHIRLPOOL cfc79835406739fc3b56a513d79d8e1391506602e4258ce21bddece09bc912bc7b51012fdb68125322b29817d5573096b7016f0c80b02b183583a480c6b77164
+EBUILD openfoam-1.7.1.ebuild 2750 SHA256 523be0e9ecc62a5b5b54ed3e82521ddd918e48c2cced01f53b77589cae4f4db0 SHA512 103f53bbe7266a84ddd680cfcec31d567e619d9c4c1f74eb9c64def7936ec599d0edcd30cbaa2ac2f3cf2b57376e4b941c12b02a079797aefc31f1466bc88b5f WHIRLPOOL 188a74a2db6d472c8d9159666053f6220d05d14932ee47f1f874e3581d6784c3065558e971ac666611ca05e23ca6a493ad85ed960f40f093844b6326ee8da581
+EBUILD openfoam-2.1.0.ebuild 2844 SHA256 f4e0241efd74524d6a361393ad3c64e0aef0806d579f1f6c34652ad8a23b03ea SHA512 f1933b48bbb01c08f0907fb35660b6ea892ffbe74fb50d8630d3e79721e6800167696cc132ffa674fa33dd5dd7a2b7033aca6a87e79eb99c69708e64aa1cc633 WHIRLPOOL 3546b65622fdd814c820a797b5fef27bcca3b5b657530927406cf0fbd72b466f5a24dd8a7b9ab72531de7d3bed58c66cb7982a3e6efbda711fdbd0f1b5f8eb2f
+EBUILD openfoam-2.1.1-r1.ebuild 2815 SHA256 f5e98b4d165543379039608a4e9994677f5e5b122a647acd67b3688f5a0ce130 SHA512 12880db3daee43731b8d80ae1d704c10e4c1c43acee8db6933347d3972e0af985019bd648f08443b0a25bcf0a1519e2584b33dcd650351d679bf4d3f5a28ec16 WHIRLPOOL 6fbe5611409b6aa72e1b14f3ed5045aa6b2bbfc336c13f2ad753556456dbe7d443aa15724222832301971350931933a3788242d3f607e9660b78dfbe419ef21d
+EBUILD openfoam-2.1.1.ebuild 2844 SHA256 414cb367e692f544301b198afdf9026147af5cb962951481cf188d48fb447dc4 SHA512 86c62feab1e99fb5f8bf100bcc457a03c35bf53bacfc95f7f9b3dfce8b9d14484d60e17544fcf5dfd80941ecf3b8daaa2647f8a7617ef6a4af51d39d20594cca WHIRLPOOL a0b31f5a1d32f46470f14354b20f23d1ce72bba8b84e3b7d9efc4fe116cc0ac6eff3795bb7a80888decee412174cc994fca977956c454ed0ffeb7fbf6d4c7021
+MISC ChangeLog 5718 SHA256 0cb6c9f2ff9a72a7e6c7f65a65353d9dd3c8bdc4bd31ed8d9fdb6ba74c3aef82 SHA512 efd287a0a4a17391c8406848026d8620901615df410df1b2fe948c98fed71d64e48964a6c14ba72859a4f3e67bddc01ea6979199920852fb7419f3ad5e3fa338 WHIRLPOOL f54c6db253ea9db9daf2cbfc1dbdbd62199d1d8d0bf0aab9479870c58c47f5dda41715521190046d29b10b64bf986df536e2fa5c8cad9e56e00627bcced6a2ed
+MISC metadata.xml 322 SHA256 0ad90544bb071480e4f598561808d748784ed1d205167d36b2d757fd263431ee SHA512 b4830e3bf4114a73b9c5cf0812615d8dec770952bdb90dca253e0436c62054139d16dd3f7ca4845b4ba0e3171daaa3a7f7335bfee92b590f9edb30159afe8137 WHIRLPOOL 5fdd2e06c99114666f44bb62af2eb570d05aa675fb39c5304b043f654a2b33e21f9b845cc499625ac3ab6df6ecf9f6f02c87136a39ca124650f67509a4a6d835
diff --git a/sci-libs/openfoam/openfoam-2.1.1-r1.ebuild b/sci-libs/openfoam/openfoam-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..165d65ee7724
--- /dev/null
+++ b/sci-libs/openfoam/openfoam-2.1.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam/openfoam-2.1.1-r1.ebuild,v 1.1 2013/02/01 08:10:20 patrick Exp $
+
+EAPI="2"
+
+inherit eutils versionator multilib toolchain-funcs
+
+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/project/foam/foam/${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="!=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
+	|| ( >sci-visualization/paraview-3.0 sci-visualization/opendx )
+	virtual/mpi"
+RDEPEND="${DEPEND}"
+
+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
+}
+
+src_compile() {
+
+	WM_NCOMPPROCS=`echo $MAKEOPTS | sed 's/-j\([0-9][0-9]*\)/\1/'`
+	if [ -n "$WM_NCOMPPROCS" ] ; then
+		export WM_NCOMPPROCS
+	else
+		export WM_NCOMPPROCS=1
+	fi
+	elog "Building on $WM_NCOMPPROCS cores"
+
+	export FOAM_INST_DIR=${WORKDIR}
+	source etc/bashrc
+
+	find wmake -name dirToString | xargs rm -rf
+	find wmake -name wmkdep | xargs rm -rf
+
+	./Allwmake || die "could not build"
+}
+
+src_test() {
+	cd bin
+	./foamInstallationTest
+}
+
+src_install() {
+	insinto ${INSDIR}
+	doins -r etc
+
+	use examples && doins -r tutorials
+
+	# not sure if this is useful
+	#doins -r src
+
+	insinto ${INSDIR}/lib
+	doins -r lib/*
+
+	insopts -m0755
+	doins -r bin applications platforms wmake
+
+	dodoc README.html doc/Guides-a4/*.pdf
+
+	if use doc ; then
+		dohtml -r doc/Doxygen
+	fi
+}