Added missing lapack dependency, fixed some as-needed requirements for parpack in the patch, fixed a test. Also should fix bug #352602 and bug #345713

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

3 files changed, 27 insertions, 19 deletions

diff --git a/sci-libs/arpack/ChangeLog b/sci-libs/arpack/ChangeLog
index cb4f43ed2a16..4324651e6c70 100644
--- a/sci-libs/arpack/ChangeLog
+++ b/sci-libs/arpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/arpack
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.23 2010/07/09 10:01:07 ssuominen Exp $
+# 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 $
+
+  24 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> arpack-96-r2.ebuild:
+  Added missing lapack dependency, fixed some as-needed requirements for
+  parpack in the patch, fixed a test. Also should fix bug #352602 and bug
+  #345713
 
   09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> arpack-96-r2.ebuild:
   ppc64 stable wrt #318649
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index de89085dd76b..c73dfd60b734 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST arpack-96-patches.tar.bz2 503733 RMD160 71a3f4bb514bdfe3ba3182b5ed2276a6a16e5203 SHA1 6d9a8ac4f432070e6f88e9eddf4bcfd7e0be34d1 SHA256 2261d5eec2fa6f014a1d08e3b66133b36c1ec5c5d913afd38114c1cd3fb1c383
+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 2908 RMD160 2e3376865c2787d2a9f46141c1536ea81966414b SHA1 97d57e716ea1fa6363a50b0f5bd480913e61427d SHA256 3093003b68accab64f7144dd5870130f39cea8a499d9ccd0bae54856c031499c
-MISC ChangeLog 3885 RMD160 fae5b4f0e35f7f67e52146759f2b04a360cede5b SHA1 74f94587ccf7531fd4da742a1689d56c83e30e60 SHA256 5192d1837058f1ace6bbae0912e77f0390504faa5dc1e1772afc85a568997aa8
+EBUILD arpack-96-r2.ebuild 3089 RMD160 c7f9adb4c87052f3afc03a0c9b4dc83b8e7305c2 SHA1 e5809e31b0ea89aea1339fd02a64e6b773b97e67 SHA256 b00cc599aab783f1f1ae889d4ec2a170bbe41e113f65d67ad738def7629c63c9
+MISC ChangeLog 4118 RMD160 db1987adac8940fea9114449c84c9d62ecb00bf2 SHA1 14389c6f017f97a721fb41506bc90cbeb0dc98ba SHA256 ebbaf9a6c2ed54df845c40dd10bd3643824cf59efc1487b37a6acaf062c6d267
 MISC metadata.xml 778 RMD160 a17303d8e0a33f121e91431bc79c29c474b89621 SHA1 48a7c028e4a85b44a816ee160da700b85eb6c81f SHA256 9322966357560a8ec46b992b22a95797cb52fb5df194e7fbca78ae05226e2fb3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk08eIwACgkQ/ejvha5XGaMF8wCcCUfQ+5GkOV6TOOe2SzyUtTaw
-MFsAnjAsFOuIqfvEW2gl8aJ4X48So0OS
-=1eMR
+iEYEARECAAYFAk096YEACgkQ1ycZbhPLE2DlEwCcCsg63L7Hyud05MYRm+AGNikU
+nC0An1QBlswmuJniTsMnpnte77QcwJwH
+=cYDZ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/arpack/arpack-96-r2.ebuild b/sci-libs/arpack/arpack-96-r2.ebuild
index 3f31cdf8423e..df0210af9bcf 100644
--- a/sci-libs/arpack/arpack-96-r2.ebuild
+++ b/sci-libs/arpack/arpack-96-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r2.ebuild,v 1.20 2010/12/01 18:15:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v 1.21 2011/01/24 21:04:56 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools toolchain-funcs
@@ -9,16 +9,17 @@ 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
-	mirror://gentoo/${P}-patches.tar.bz2
+	http://dev.gentoo.org/~bicatali/${P}-patches.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="mpi doc examples"
+IUSE="doc examples mpi static-libs"
 
 RDEPEND="virtual/blas
+	virtual/lapack
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -31,20 +32,20 @@ src_unpack() {
 }
 
 src_prepare() {
+	cd "${WORKDIR}"
 	epatch "${WORKDIR}"/${PN}-arscnd.patch
 	epatch "${WORKDIR}"/${PN}-autotools.patch
-
-	BLAS_LIBS="$(pkg-config --libs blas)"
+	cd "${S}"
 	# fix examples library paths
 	sed -i \
 		-e '/^include/d' \
-		-e "s:\$(ALIBS):-larpack ${BLAS_LIBS}:g" \
+		-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 ${BLAS_LIBS}:g" \
+		-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' \
@@ -54,7 +55,9 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--with-blas="${BLAS_LIBS}" \
+		--with-blas="$(pkg-config --libs blas)" \
+		--with-lapack="$(pkg-config --libs lapack)" \
+		$(use_enable static-libs static) \
 		$(use_enable mpi)
 }
 
@@ -77,7 +80,7 @@ src_test() {
 		emake \
 			FC=mpif77 \
 			EXTOBJS="dpttr{f,s}.o" \
-			LDFLAGS="-L${S}/.libs -L${S}/PARPACK/.libs" \
+			LDFLAGS="${LDFLAGS} -L${S}/.libs -L${S}/PARPACK/.libs" \
 			pdndrv || die "emake pdndrv failed"
 		for p in 1 3; do
 			prog=pdndrv${p}