Fixed MPI for openmpi (bug #354993, thanks Yang Zhang. Added a patch to fix occasional crashes taken from octave/debian.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 129 insertions, 5 deletions

diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog
index 4324651e6c70..c17257708df4 100644
--- a/sci-libs/arpack/ChangeLog
+++ b/sci-libs/arpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/arpack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.24 2011/01/24 21:04:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.25 2011/03/07 17:59:59 bicatali Exp $
+
+*arpack-96-r3 (07 Mar 2011)
+
+  07 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +arpack-96-r3.ebuild:
+  Fixed MPI for openmpi (bug #354993, thanks Yang Zhang. Added a patch to fix
+  occasional crashes taken from octave/debian.
 
   24 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> arpack-96-r2.ebuild:
   Added missing lapack dependency, fixed some as-needed requirements for
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index c73dfd60b734..1c4df7d0c4f6 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST arpack-96-patches-2.tar.bz2 504621 RMD160 bd6e20320a732ae7d5d0319cb4d12b1b0c05e3d8 SHA1 a4a17efd5a6488aa24934cb3d5d3de94d8d7ee87 SHA256 ecb2aa94feff0ff6d9df3416c205d3c3715073e6abaa58dc3a39786ca7e686fc
 DIST arpack-96-patches.tar.bz2 503753 RMD160 2708ffa25ea003b4c0122e93868e48ff517a5bc1 SHA1 dca33500f2b10667b6fc356b52882e2c70788197 SHA256 98a0af4bada8dcce7dcda009962e65f774c5f707e12f72438187e1e4cc5db6ba
 DIST arpack96.tar.gz 636865 RMD160 3d1c1c307223961506066f895b7ab291861e73fe SHA1 3f91de2b39b484bc8365f8048c9eb109e0306e1c SHA256 c6a47eca30a256cbae60e69c606251b84b6a0f352ba527b2dcbd4789ce85ecfc
 DIST parpack96.tar.gz 509316 RMD160 224d61ef7ff9eec5f59b747d669f3deb74eb2ba5 SHA1 ebcb4de09639a2faa929bb1a46ba7350d1aa58da SHA256 3b6a1ceec06f14e2a06c323721baa908c2f7823d1da79cdfd3f91961f8b6b926
 DIST tutorial.ps.gz 105599 RMD160 aaba42a6d5ce212e56f312d6187ba932d3b674b7 SHA1 70961d4e3463d012b33a1bbe25b5761d2a25a4d0 SHA256 2f745fe80b0a4fcdf1c273995ed67bc6cf03684ccbaa44442ad1187ea41b81c0
 DIST ug.ps.gz 248543 RMD160 29911161dbc7f496ee16db3c98047dae0be51da2 SHA1 6ad34e7ddee64a340e756d55690a2f4e4f46e767 SHA256 ff1faac74bfc42442955906132756ecd7f0034803898d507dbd1bc960f6f4ab0
 EBUILD arpack-96-r2.ebuild 3089 RMD160 c7f9adb4c87052f3afc03a0c9b4dc83b8e7305c2 SHA1 e5809e31b0ea89aea1339fd02a64e6b773b97e67 SHA256 b00cc599aab783f1f1ae889d4ec2a170bbe41e113f65d67ad738def7629c63c9
-MISC ChangeLog 4118 RMD160 db1987adac8940fea9114449c84c9d62ecb00bf2 SHA1 14389c6f017f97a721fb41506bc90cbeb0dc98ba SHA256 ebbaf9a6c2ed54df845c40dd10bd3643824cf59efc1487b37a6acaf062c6d267
+EBUILD arpack-96-r3.ebuild 3131 RMD160 5b2d600a8a5aa92caff78d9780bfb59777eaf9f8 SHA1 0d6a1343ffd0dc9eb3dd0905ff9f6cb2364eb0e0 SHA256 40cdb4997d727a2972fb0b67afbdb64cf76de7fd0784f78320661186c6ca26af
+MISC ChangeLog 4350 RMD160 4121376a3faa3e2f83a45db9331827f56e8dab92 SHA1 3d8cf24fe5e1692dd5fa51ac2df61c90dfc1b0a4 SHA256 1785b7bc02f7606ae12d6c356277cf608e153f4fca18a10ac8d59ee1957ed5c6
 MISC metadata.xml 778 RMD160 a17303d8e0a33f121e91431bc79c29c474b89621 SHA1 48a7c028e4a85b44a816ee160da700b85eb6c81f SHA256 9322966357560a8ec46b992b22a95797cb52fb5df194e7fbca78ae05226e2fb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk096YEACgkQ1ycZbhPLE2DlEwCcCsg63L7Hyud05MYRm+AGNikU
-nC0An1QBlswmuJniTsMnpnte77QcwJwH
-=cYDZ
+iEYEARECAAYFAk11HSkACgkQ1ycZbhPLE2A6UwCgj/+ifQQh+Po85Ve6UeI2EgUx
+71oAnjdlnHMZ8D/W8k7XRo8/D2S5in1a
+=Oq8w
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/arpack/arpack-96-r3.ebuild b/sci-libs/arpack/arpack-96-r3.ebuild
new file mode 100644
index 000000000000..b9833f7ae8c2
--- /dev/null
+++ b/sci-libs/arpack/arpack-96-r3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r3.ebuild,v 1.1 2011/03/07 17:59:59 bicatali Exp $
+
+EAPI=4
+inherit eutils autotools toolchain-funcs flag-o-matic
+
+DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems."
+HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/"
+SRC_URI="http://www.caam.rice.edu/software/ARPACK/SRC/${PN}${PV}.tar.gz
+	http://www.caam.rice.edu/software/ARPACK/SRC/p${PN}${PV}.tar.gz
+	http://dev.gentoo.org/~bicatali/${P}-patches-2.tar.bz2
+	doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz
+		http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples mpi static-libs"
+
+RDEPEND="virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/ARPACK"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./*patch.tar.gz
+}
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${WORKDIR}"/${PN}-arscnd.patch
+	# http://savannah.gnu.org/bugs/?func=detailitem&item_id=31479
+	epatch "${WORKDIR}"/${PN}-neupd.patch
+	epatch "${WORKDIR}"/${PN}-autotools.patch
+
+	cd "${S}"
+	# fix examples library paths
+	sed -i \
+		-e '/^include/d' \
+		-e "s:\$(ALIBS):-larpack $(pkg-config --libs blas lapack):g" \
+		-e 's:$(FFLAGS):$(FFLAGS) $(LDFLAGS):g' \
+		EXAMPLES/*/makefile || die "sed failed"
+
+	sed -i \
+		-e '/^include/d' \
+		-e "s:\$(PLIBS):-larpack -lparpack $(pkg-config --libs blas lapack):g" \
+		-e 's:_$(PLAT)::g' \
+		-e 's:$(PFC):mpif77:g' \
+		-e 's:$(PFFLAGS):$(FFLAGS) $(LDFLAGS) $(EXTOBJS):g' \
+		PARPACK/EXAMPLES/MPI/makefile || die "sed failed"
+
+	# bug #354993
+	rm -f PARPACK/SRC/MPI/mpif.h
+	#ln -s "${EPREFIX}"/usr/include/mpif*.h PARPACK/SRC/MPI/
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-blas="$(pkg-config --libs blas)" \
+		--with-lapack="$(pkg-config --libs lapack)" \
+		$(use_enable static-libs static) \
+		$(use_enable mpi)
+}
+
+src_test() {
+	pushd EXAMPLES/SIMPLE
+	emake simple FC=$(tc-getFC) LDFLAGS="${LDFLAGS} -L${S}/.libs"
+	local prog=
+	for p in ss ds sn dn cn zn; do
+		prog=${p}simp
+		LD_LIBRARY_PATH="${S}/.libs" ./${prog} \
+			|| die "${prog} test failed"
+		rm -f ${prog} *.o
+	done
+	popd
+
+	if use mpi; then
+		pushd PARPACK/EXAMPLES/MPI
+		mpif77 ${FFLAGS} -c ../../../LAPACK/dpttr{f,s}.f \
+			|| die "compiling dpttrf,s failed"
+		emake \
+			FC=mpif77 \
+			EXTOBJS="dpttr{f,s}.o" \
+			LDFLAGS="${LDFLAGS} -L${S}/.libs -L${S}/PARPACK/.libs" \
+			pdndrv || die "emake pdndrv failed"
+		for p in 1 3; do
+			prog=pdndrv${p}
+			LD_LIBRARY_PATH="${S}/.libs:${S}/PARPACK/.libs" \
+				./${prog} || die "${prog} test failed"
+			rm -f ${prog} *.o
+		done
+		popd
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README DOCUMENTS/*.doc
+	newdoc DOCUMENTS/README README.doc
+	use doc && dodoc "${WORKDIR}"/*.ps
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r EXAMPLES
+		if use mpi; then
+			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
+			doins -r PARPACK/EXAMPLES/MPI
+		fi
+	fi
+}